module fix-3

Merged Olav Kvittem requested to merge module-fix3 into master

Merge request reports