Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pick-head...