Merge pull request #2342 from vladimirfomene/2023-06-use-untrustedstring-in-error...