Fixed: Template column support