Merge branch 'FindBoost-1.71' into release-3.15

Merge-request: !3763