Merge branches 'mad-response' and 'mlx4' into fixes