swc-1036 - dream changes
Merge pull request #675 from dburdick/swc-1036

swc-1036 - dream changes