Merge branch 'feature-peer-improvements-rebased' into develop