Merge branch 'bc/fortran-userdiff' into maint