Merge branch 'release/1.11' into dev
Second commit
Made changes in release 1.12
Merge branch 'release/1.12'