Upcoming 1.6 version