[sr-dev] git:master:70929caa: Merge pull request #2305 from dsciarra/do-not-use-tcp-id-for-lookup