Merge pull request #2062 from 9rnsr/fix10134

[2.063a] Issue 10134 - Mutual referencing templates error