Michelo master patch 70193

Merge request reports