SWC-1613, SWC-1661, SWC-1664
Merge pull request #1155 from jay-hodgson/release-56

SWC-1613, SWC-1661, SWC-1664