sync daily version 1.1.7
sync daily branch 1.1.6