1.6 for 1.7

Can't check CI in detail any more...