Merge branch 'mr/doc-clean-f-f' into maint