Partial update to 3.10.1