Merge pull request #7699 from huangshiwu/v3_wp8fix

V3 wp8fix