SWC-676: move to shared utility class