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