upstream 2.10.3