SWC-1828: merge fix to release-63
Merge pull request #1263 from jay-hodgson/release-63

SWC-1828: merge fix to release-63