v1.66 to v1.69