SWC-1650
Merge pull request #1135 from jay-hodgson/release-55

SWC-1650