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