Update to latest

Includes #2473, #2475, #2498, #2514, #2544, #2554, #2555