Merge proposals

additional-discount has no merge proposals.