Merge branch 'js/maint-submodule-checkout' into maint