Merge branch 'js/repoconfig' into next