[don't merge] Fix Retrace as additional cost#15585

nandmp wants to merge 5 commits into

magefree:mastermagefree/mage:masterfrom

nandmp:RetraceAsAdditionalCostnandmp/mjolnir:RetraceAsAdditionalCostCopy head branch name to clipboard