sync daily branch 1.0.4