Potential crash if attempt to write before all_channels.events file is created.
Merge remote-tracking branch 'origin/master' into master1