Merge pull request #13393 from royalhuang/story_135779791_issue_13392