Merge pull request #852 from jay-hodgson/release-32

merge changes for SWC-1219 and SWC-1224 into release-32