merge from jiangming-dev
merge from jiangming-dev