issue #19796: More progress fixing cost/price calculations