[PATCH 1/2] Some more stuff for the mangleMap (#866730)