sync daily branch 3.4.1