Port to 1.7