Synced changes from agora repo plus fix in controller user_main