merge from jiangming-dev