Merge branch 'js/config-rename'