Merge branch 'bc/fortran-userdiff'