Merge branch 'master' into ibm-issue-67506

Conflicts:
	app/i18n/translations_en.json