Merge pull request #15004 from davejenx/dev-core-860-discount-line-items-fix2