Merge branch 'jc/maint-pull-docfix' into maint