Synced with Agora v13.10.16