1.7.10 fixes and workspace reconfiguration