Merge "Remove non-UTF8 characters from string fields." into main