Merge cm-12.0 into lp branch