Merge to upstream 3.12.3