Merge branch 'FindBoost-component' into release-3.15

Merge-request: !3438