Merge pull request #1382 from 9rnsr/fix8913

Issue 8913 - Wrong code in IfStatement condition Expression
fix Issue 9276 - regression(2.061): Forward reference error