Merge pull request #212 from jrogelstad/master

issue #18661: Merge to master.
issue #18406: update submodule
Merge pull request #213 from shackbarth/18406

issue #18406: update submodule
Merge pull request #21 from xtuple/master

Catch up.