Merge pull request #693 from jay-hodgson/develop

merge down from release-21 to develop
SWC-1039: in progress