issue #19550: First pass bug fixing.
issue #19550: More fixes
issue #19550: Add missing model definitions.
issue #19550: swat.
Merge branch 'master' into 19550
issue #19550: More fixes
Merge pull request #17 from jrogelstad/19550

Catch up.