upstream 4.3.2