Import from Agora commit 58b4415 without bigdata