Merge branch 'js/branch-track-inherit'