Merge branch 'jh/clean-smudge-f-doc'