Merge pull request #5150 from yan12125/yam_fix