Merge branch 'pch-makefile-depends' into release-3.16

Merge-request: !3928