merge cm-16 to dev_1.0

Fixed failed issue