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

issue #21836: Swat.