Updated from Agora commit d8de134