Merge pull request #2307 from saiarcot895/mongo-mem-leak