Merged changes from 'Utils'.