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

SWC-1538 and SWC-1537