merge cm-4 to dev_1.0