Revise parsing of string with unicode quoted data
Merge branch 'ari-4020' into qa