merge dev_1.0 to cm-5