SWC-471: fix build (merge issue)