Merge pull request #7254 from annando/fix-plaintext