Merge branch 'implicit-lib-gcceh-file' into release-3.11

Merge-request: !1967