Made changes in release 1.12
Merge branch 'release/1.12' into dev

Conflicts:
	test1.txt