Updated from Agora commit 1fcddd