Merge pull request #2192 from 9rnsr/fix10373

[REG2.063] Issue 10373 - cannot resolve forward reference