sync daily branch 3.6.1