Merge branch 'jk/check-repository-format' into maint