Merge branch 'backport-autogen_revert_implicit_includes' into release-3.13

Merge-request: !2709