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

test on staging
Merge pull request #1233 from john-hill/SWC-1762

develop
Merge branch 'release-61' into develop
cleanup
Merge pull request #1236 from jay-hodgson/uploader-cleanup

cleanup
code review one
Merge branch 'develop' into uploader-2
code review changes