Merge branch 'backport-FindBoost-1.65' into release-3.9

Merge-request: !1280