Workspace preparations (WWW-1301)