sync daily branch 3.5.2