Update to latest

Includes: #2630, #2633, #2616, #2623, #2622, #2636, #2615, #2649, #2639, #2635