Workspaces for tests-stage_2-merge ยป bug1511 #2