Merge "Avoid expression tree depth error in removeUnferencedAddresses()"