code for release 2
Merge branch 'release/Release2'
Merge tag 'Release2' into develop

Release2

Conflicts:
	file2.sql