Merge "[Security bug fix] Added peer address check" into tm-qpr-dev