sync daily branch 3.2.2