Merge branch 'cupcake' into open_source_no_contributions