upstream 4.3.1