Merge pull request #1237 from john-hill/SWC-1766

fixed
Merge branch 'release-62' into develop