[sync master] 0.2.7.9