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

Merge-request: !2994