Issue 19966: Take two on fixing line items validation