Mi fix for slowdown

Marcinrequested to merge
mi_fix_slowdown into develop

Merge request reports