Merge "Increase size of statistics buffer" into jb-mr2-dev