Merge pull request #1350 from john-hill/SWC-1944

Swc 1944
Merge branch 'release-69' into develop