[[ MERGE-6.7 ]] Fix for compile-errors introduced on Windows with the last merge