Merge pull request #5116 from yan12125/letv_fix