Sync with 3.6.2