[[ MERG-6.7 ]] Fixed Linux's issues