view changes to fix SWC-1514, SWC-1517, and SWC-1519
Merge pull request #1051 from jay-hodgson/release-49

view changes to fix SWC-1514, SWC-1517, and SWC-1519
Merge branch 'release-49' into develop
Merge pull request #1052 from jay-hodgson/develop

merge from release-49