Mpr compat

Merged Robert Schweppe requested to merge mpr_compat into develop

Merge request reports