Merge branch 'js/repoconfig'