SWC-658: merge down from release-y