Merge "Fixed bug in uses statement resolving."