fix Issue 10425 - Link error with templates
Merge pull request #2582 from 9rnsr/fix10425

[REG2.062] Issue 10425 - Link error with templates