Latest upstream merge + associated fixes