case 3976 - Fix module definition.
Merge branch 'case-3976' into development