Moved from 'util'. For previous commits, see 'util'