backport
Merge branch 'Release-1'

Conflicts:
	Test file.txt
Add lines
even more lines