add hammerhead cherry-picks