Updated from Agora commit 10032b8968