Merge branch 'vswhere-support-x86' into release-3.24

Merge-request: !7832