Merge branch 'jk/maint-docs' into maint