Sync with 2.32.7