issue #19268: bugfixes
Merge pull request #117 from shackbarth/19268

issue #19268: bugfixes
Merge pull request #22 from xtuple/master

Catch up.