Merge branch 'release/1.11'
Merge branch 'release/1.12'
Made fix
Merge branch 'hotfix/I_want_to_fix_issue' into dev

Conflicts:
	test1.txt