Merge pull request #554 from dburdick/swc-816

Swc 816 fix header
Merge branch 'release-10' into develop