sunhaicheng
merge & fix