Statistics Channel Fixes

Merged Mark Andrews requested to merge 1030-statistics-channel-fixes-v9_11 into v9_11

Merge request reports