Merge pull request #1941 from tmccombs/fix-attest