Fixed a bug where the current Module was not set correctly
Merge remote-tracking branch 'origin/resource_handling' into resource_handling