Sync with the latest version 1.2.4