SWC-1633
Merge pull request #1120 from jay-hodgson/release-54

SWC-1633
Merge branch 'release-54' into develop
Merge pull request #1121 from jay-hodgson/develop

merge from release-54