Patch for proper module version
Merge branch 'case-4117' into development