Merge branch 'PIM-3369' into 1.2

Conflicts:
	CHANGELOG.md