merging lots of cm stuff and hopefully fix for failed builds