[sync master] 0.3.4.2