stuff
more stuff
doulbe, int, link
cr changes
Merge pull request #1358 from john-hill/SWC-1424

Swc 1424