merge from apache:master to caofangkun:master