Merge "Extend support for requestRouteToHostAddress for backward compatibility"