Merge branch 'js/filter-branch-submodule'