sync daily branch 0.1.7