Statistics Channel Fixes

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

Merge request reports