sync daily branch 3.5.0
sync daily version 3.5.0