CLSN-1904 Angular Template Issue