Synced with Agora v14.04.09