Synced with Agora v13.12.16