[[ Merge 6.7 ]] Fix compile error