1.6 for 1.7

* [x] CI