Merge branch 'implicit-includes' into release-3.14

Merge-request: !3157