Merge pull request #5328 from yan12125/fix_5226