Module fix

Olav Kvittem requested to merge module-fix into master

Merge request reports