[MMSYS] Addendum to r68073. CORE-9580