ticket:6 Fixed templates after branches merging