Merge pull request #13383 from royalhuang/feat_13382_review_mention