SWC-728: more progress