merge cm-5 to dev_1.0