sync daily branch 3.0.4