Merge pull request #10066 from annando/decode