Changed rate at which diags are sent back
Merge remote-tracking branch 'origin/master'