This should fix the windows tests. Re #7253
Merge branch 'feature/7253_workspace_groups_and_dock' into develop