CORE-597 really include templates