Merge "Bug 6110: Fixed bugs in statistics manager due to race condition." into stable...