upstream 4.2.8