Merge branch 'vs-depends-dedup' into release-3.14

Merge-request: !3388