SWC-676: move to shared utility class
Merge pull request #400 from jay-hodgson/release-1

SWC-676: move to shared utility class