Merge branch 'vendor_drops' into prism_dev