re #9908 done down to and including RenameWorkspace
re #9908 done squares