Sync with 1.1.0 from Roberto