Synced with 3.11.6