Merge pull request #1020 from jay-hodgson/release-46

SWC-1480 and SWC-1481
fix link