refs 6055 master merged

Conflicts:
	config/locales/translation_en.yml
	config/locales/translation_ja.yml