Follow upstream 1.12