[sync master] 0.3.2.5