merging with master to remove string_utils dependency