Better peer identification

Also, we discussed that we should be doing this only when op-version is >= 3_6_0 and retain the previous behaviour otherwise.