sync daily branch 3.0.3
sync daily version 1.1.8