Cherry-pick me

Conflicts:
	test