Merge branch 'js/config-set-in-non-repository' into maint