Thinking that this could be eligible to be backported, provided that @zeusca can test and confirm it works fine.
Otherwise stable deployments might not get calls properly connected by not detecting this kind of a non-routable address. Personally I haven't faced such case, so I am fine either way.