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

SWC-1828: merge fix to release-64