Fixing flyweight templates
Merge