Replace stringutil.Override
with cmp.Or
#394
Merged
stringutil.Override
with cmp.Or
#394