Cherry pick MCAlgs fix for 2017-patches

Cherry pick of !3550 (merged)

Merge request reports

Loading