upstream 4.2.7