New upstream 0.9