Merge pull request #634 from dburdick/swc-690

Swc 690
Merge branch 'release-18' into develop