Update to latest

Includes #2463, #2434