Merge branch 'FindPython-lib-arch' into release-3.13

Merge-request: !2624