Merge branch 'boost-1.68-beta1' into release-3.12

Merge-request: !2204