Merge branch 'jk/repository-extension' into maint