Merge "Bug 1446: Add new concurrent classes for tracking stats"