Sync up with mainline to bring up improvements in various subsystems.