merge from facebook/presto