Merge branch 'backport-implicit-includes-extra-CR' into release-3.15

Merge-request: !4088