[sync master] 0.2.8.3