Merge pull request #23551 from dnlplm/dp/mm-qmap-fix