issue #2129: Removing CC prefix for template.
Merge pull request #2953 from dumganhar/develop

issue #2129: Removing CC prefix for template.