Merge branch 'FindBoost-1.69' into release-3.13

Merge-request: !2522