Merge branch 'FindBoost-layout-tagged' into release-3.14

Merge-request: !2961