[mcs] Improve commit 409024fcab7a571abd602a3701e5986d810356cc