Merge branch 'js/maint-fetch-update-head' into maint