Squished vendor_cm commits