Import of 6.1p1