Update to 3252:7e569a9cb5fd