sync daily version 3.5.2
sync daily branch 3.5.0