GS-11225 new utility method and class were added