Merge pull request #7890 from yanrayw/aes_comment_fix