Merge branch 'version-1.1'

Sync with original