Merge pull request #22988 from vrabaud:mm_pause_fix