1.6 for 1.7

Will run through CI.

@domsj Would you mind performing the manual test for the ticket on this branch?