Merge pull request #896 from john-hill/SWC-1268

check
Merge branch 'release-36' into develop