1.6 for 1.7

Looks OK on CI