merge form JiongCHEN
merge form Trunk