Fixed v1.7-R1 support