Merge branch 'fe/doc-updates' into maint