Worked on RG-181 to remove msg templates