Merge branch 'ah/doc-filter-branch-export-env' into maint