Pull recent Hadrian changes from upstream