Merge branch 'pch-generate' into release-3.16

Merge-request: !3890