I've done the attached patch to collect & clean up all the things that happened since yesterday.
Attach a file by drag & drop or click to upload
