issue #19814: Swat. Swat. Swat.
Merge pull request #262 from jrogelstad/master

issue #19814: Various bug fixes.