MOAR Cherry pick patches