Implement instrumentation for bytes read/written and channel count
Merge branch 'master', remote-tracking branch 'upstream/master'