Merge pull request #1232 from john-hill/SWC-1762

test on staging
Merge branch 'release-61' into develop