Merge pull request #864 from valentinewallace/background-process-peer-events