1.7.0 is next in this branch