ECMS-4918 UI Templates Defect