fix package change vs. v4 discount refactor, RT#77513, RT#14092