sync daily branch 2.5.0