sync daily version 3.0.4
sync daily branch 3.0.4