Second commit for cherry picking

Conflicts:
	file_bar.txt