bbu mongo error fix
Merge branch 'master' into server_mode