Sync with 2.10 branch