Merge "[BUGFIX] Missing behaviour of options.workspaces.changeStageMode"