EZP-23199: Added support for partial templates
Fixed various typos