Sync to Official Version 1.0.4