Import from Agora commit e42fc95