Merge pull request #5198 from BrzVlad/fix-binprot-stats