Bug 40028 and 40027: add support for modules - v5

Merge request reports

Loading