[[ MERG-6.7 ]] Player updated to compile on Windows