Merge branch 'out-of-dir-linking-private-deps' into release-3.13

Merge-request: !3276