Workspaces for NBI-stage_2 ยป feature7106 #2