Merge branch 'fix-legacy-implicit-includes' into release-3.14

Merge-request: !2981