Merge branch 'jc/maint-push-doc-status' into maint