merge change from shaojun

merge change from shaojun