Merge pull request #19455 from mhei/mmc-utils-update