Merge "Fix template support."