Synced with Agora v14.12.22