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