A bunch of CM upstream updates