SMS/email debug
Merge dev_xue into dev