Update to latest

Includes #2419, #2428, #2418, #2443, #2433