Merge branch 'ganesh-branch'

Conflicts:
	test-folder/sample-234.txt