CORE-4031: added some new message templates