Fix module resolving

Vadym Tishchenko requested to merge vadym/fix_module_resolver into master

Merge request reports