merge SWC-456 up from develop
Merge pull request #220 from jay-hodgson/release-1.22

merge SWC-456 up from develop