Sweeping !34420 from 21.3 to 21.9. MM geometry fixes

MM geometry fixes

See merge request !34420 (merged)

Merge request reports

Loading