Merge "Avoid expression tree depth error in removeUnferencedAddresses()"
am: 0931c72127

* commit '0931c72127e034a3b5a542ed59514ee539a805ea':
  Avoid expression tree depth error in removeUnferencedAddresses()