SWC-658: more changes