DEV-65944 - Always move selected configuration to foreground
Merge remote-tracking branch 'origin/release/8.22.0' into release/8.22.0