Re #7218. Lock the workspace during the clone operation.
Merge branch 'feature/7218_monitorlivedata_occasional_test_failures' into develop