add some cherry-picks back in