Merge branch 'dev-1.1'