Add v1.7, v1.6 and v1.5 changes