Update to latest

Includes #2718, #2705, #2694, #2689, #2679, #2672, #2671