cherry-pick topic change2

Conflicts:
	file_client_1.txt