Beacon is now a default init peer
Merge branch 'feature-beacon-fixes' into develop