Merge branch 'js/maint-rebase-i-submodule'