LPS-51383 Apply to fieldRawValue for consistency