Merge branch 'Boost-Gentoo' into release-3.14

Merge-request: !3237