[[ Merge 6.7 ]] Fix windows compile issue