sync daily version 2.5.0
sync daily branch 2.5.0