Merge controller fix from mongodb to master