Cm 2036945 modules

Lukas Werner requested to merge cm_2036945_modules into dev

Merge request reports