Various updates
Merge branch 'release/1.1'