Initial import of upstream 6371bd74