issue #20864: mix in some more line item functionality
Merge pull request #658 from shackbarth/20864

issue #20864: mix in some more line item functionality