Merge pull request #6242 from dstftw/f4m-improvements