Merge branch 'jk/check-docs-update' into maint