Merge branch 'js/branch-config'