Merge pull request #243 from jrogelstad/master

issue #19456: Tweak
Merge pull request #244 from jrogelstad/master

issue #19451: Merge to master.
Merge pull request #33 from xtuple/master

catch up.