Merge branch 'fa/maint-config-doc' into maint