Update for new cherries and comment out ones that are merged