ticket:3 fix
ticket:3 tpl fix
merge: Conflicts fix