Merge "[Security bug fix] Added peer address check"