Added 1.6.x branch