SWC-1629 and SWC-1630
Merge pull request #1118 from jay-hodgson/release-54

SWC-1629 and SWC-1630
Merge branch 'release-54' into develop
Merge pull request #1119 from jay-hodgson/develop

merge from release-54