Plaintext signature cherrypicked

Plain text signature addition. The required commit has been cherry-picked.