SWC-1128
Merge pull request #769 from jay-hodgson/release-26

SWC-1128: support clean input