Sync with 1.1 version.