Workspaces for osm-stage_3-merge ยป bug1511 #2