Update everything after upstream merge