Update cherry-picks; backup portion