Merge pull request #16626 from pradpnayak/lineItemFixes