SWC-664: from code review