ticket: 6 Template changed