Sync with v1.1.0.Final