sync daily branch 1.1.8