Merge pull request #3902 from henricm/fix-rename-lpstr-utf8