LPS-43734 Apply NullSafeStringComparator
LPS-43734 Regenerate