[sync master] 1.0.6