Merge pull request #1118 from jay-hodgson/release-54

SWC-1629 and SWC-1630
SWC-1633