Merge pull request #2671 from 9rnsr/fix11225

[REG2.061] Issue 11225 - Module dependency cycle causes import statements inside typeof() expressions inside templates to fail