Merge "Fix template generator for R2"