Issue #22031: Fixed configure workspaces
Merge branch 'master' into 22031
Merge pull request #1092 from lynnaloo/22031

Issue #22031 - Fix for configuration workspaces