sms
Merge dev_xue into dev