sync daily branch 3.0.5
sync version 3.0.5