-- commited for msg templates. RG-108