Merge branch 'ghs-updates' into release-3.14

Merge-request: !2943