Fix that includes variable definitions while imports resolving
Merge branch 'origin/master'
Tests that caused errors ignored.