SWC-1538 and SWC-1537
Merge pull request #1074 from jay-hodgson/release-51

SWC-1538 and SWC-1537
Merge pull request #1075 from jay-hodgson/develop

merge from release-51