Synced with Agora v14.05.28