upstream 4.2.6