Merge branch 'mlx5-build-fix'