LPS-51857 Use compat version of StringUtil
LPS-52008 SF