Merge pull request #80 from jrogelstad/19550

issue #19550: Lots of fixes. Filling out missing parts.
Merge branch 'xtuple' into 19550