Merge branch 'FindBoost-no-cxx' into release-3.13

Merge-request: !2663