Merge pull request #2075 from 9rnsr/fix10166

[REG2.063a] Issue 10166 - XXX is not a template