Changes for v1.7