Merge "Fix template generation for R2"