Merge branch 'jc/nobody-sets-src-peer-ref'