Moved ART upstream