Keeping changes as 1.7 till release