Test Template_Simple - from old Sukria branch
Update Changes
Merge branch 'pr/test_template_simple'