Merge branch 'release/Release_1.1' into develop