Merge branch 'ci/stripspace-docs' into maint