Merge branch 'cm-12.0' from TheMuppets github