issue #21836: Swat.
Merge pull request #991 from jrogelstad/21836a

Issue #21836: Swat