Merge pull request #14216 from alifrumin/dontmunge