Merge "[AWARE] Make PeerHandle comparable/hashable" into oc-mr1-dev