Merge update from xiaolu:cm-11.0