Merge pull request #2562 from BrzVlad/fix-drainstack-stats