[DF-185] Fixed Tempate Project