Manually sweep !32124 from 21.3 to master

Alexandre Laurierrequested to merge
alaurier/athena:MM_OverlaySweep into master

Manual sweep of a bug fix in MM_Overlay that would cause a crash in rare circumstances.

Merge request reports