Merge pull request #1225 from john-hill/SWC-1702

Swc 1702
Merge pull request #1226 from john-hill/SWC-1702

code review changes
done
Merge pull request #1229 from john-hill/SWC-1706

Swc 1706