Merge from 1.7

So we can trial recent 1.7 bugfix changes in a testing release