Merge branch 'FindPython-fix-VIRTUALENV-eq-FIRST' into release-3.16

Merge-request: !4557