@unihorn I am not adding the default-peer behavior in this PR. It exists today in master. We will discuss further offline.