diff --git a/.github/lexicon.txt b/.github/lexicon.txt
index b827c6564c..d0e086990f 100644
--- a/.github/lexicon.txt
+++ b/.github/lexicon.txt
@@ -1239,6 +1239,7 @@ uxstreambufferget
 uxstreambuffermidspace
 uxtail
 uxtaskgetsystemstate
+uxtickstowait
 uxtimeout
 uxtimeoutstate
 uxtotaldatalength
diff --git a/FreeRTOS_ARP.c b/FreeRTOS_ARP.c
index 91baca8a4b..9295f126ed 100644
--- a/FreeRTOS_ARP.c
+++ b/FreeRTOS_ARP.c
@@ -271,12 +271,8 @@ void vARPRefreshCacheEntry( const MACAddress_t * pxMACAddress,
     uint8_t ucMinAgeFound = 0U;
 
     #if ( ipconfigARP_STORES_REMOTE_ADDRESSES == 0 )
-
-        /* Only process the IP address if it is on the local network.
-         * Unless: when '*ipLOCAL_IP_ADDRESS_POINTER' equals zero, the IP-address
-         * and netmask are still unknown. */
-        if( ( ( ulIPAddress & xNetworkAddressing.ulNetMask ) == ( ( *ipLOCAL_IP_ADDRESS_POINTER ) & xNetworkAddressing.ulNetMask ) ) ||
-            ( *ipLOCAL_IP_ADDRESS_POINTER == 0UL ) )
+        /* Only process the IP address if it is on the local network. */
+        if( ( ulIPAddress & xNetworkAddressing.ulNetMask ) == ( ( *ipLOCAL_IP_ADDRESS_POINTER ) & xNetworkAddressing.ulNetMask ) )
     #else
 
         /* If ipconfigARP_STORES_REMOTE_ADDRESSES is non-zero, IP addresses with
@@ -492,16 +488,6 @@ eARPLookupResult_t eARPGetCacheEntry( uint32_t * pulIPAddress,
 
     ulAddressToLookup = *pulIPAddress;
 
-    #if ( ipconfigUSE_LLMNR == 1 )
-        if( ulAddressToLookup == ipLLMNR_IP_ADDR ) /* Is in network byte order. */
-        {
-            /* The LLMNR IP-address has a fixed virtual MAC address. */
-            ( void ) memcpy( pxMACAddress->ucBytes, xLLMNR_MacAdress.ucBytes, sizeof( MACAddress_t ) );
-            eReturn = eARPCacheHit;
-        }
-        else
-    #endif
-
     if( xIsIPv4Multicast( ulAddressToLookup ) != 0 )
     {
         /* Get the lowest 23 bits of the IP-address. */
@@ -522,6 +508,12 @@ eARPLookupResult_t eARPGetCacheEntry( uint32_t * pulIPAddress,
          * can be done. */
         eReturn = eCantSendPacket;
     }
+    else if( *ipLOCAL_IP_ADDRESS_POINTER == *pulIPAddress )
+    {
+        /* The address of this device. May be useful for the loopback device. */
+        eReturn = eARPCacheHit;
+        memcpy( pxMACAddress->ucBytes, ipLOCAL_MAC_ADDRESS, sizeof( pxMACAddress->ucBytes ) );
+    }
     else
     {
         eReturn = eARPCacheMiss;
@@ -747,7 +739,7 @@ void FreeRTOS_OutputARPRequest( uint32_t ulIPAddress )
             }
         #endif /* if defined( ipconfigETHERNET_MINIMUM_PACKET_BYTES ) */
 
-        if( xIsCallingFromIPTask() != 0 )
+        if( xIsCallingFromIPTask() != pdFALSE )
         {
             iptraceNETWORK_INTERFACE_OUTPUT( pxNetworkBuffer->xDataLength, pxNetworkBuffer->pucEthernetBuffer );
             /* Only the IP-task is allowed to call this function directly. */
@@ -769,7 +761,63 @@ void FreeRTOS_OutputARPRequest( uint32_t ulIPAddress )
         }
     }
 }
-/*--------------------------------------*/
+/*-----------------------------------------------------------*/
+
+/**
+ * @brief  Wait for address resolution: look-up the IP-address in the ARP-cache, and if
+ *         needed send an ARP request, and wait for a reply.  This function is useful when
+ *         called before FreeRTOS_sendto().
+ *
+ * @param[in] ulIPAddress: The IP-address to look-up.
+ * @param[in] uxTicksToWait: The maximum number of clock ticks to wait for a reply.
+ *
+ * @return Zero when successful.
+ */
+BaseType_t xARPWaitResolution( uint32_t ulIPAddress,
+                               TickType_t uxTicksToWait )
+{
+    BaseType_t xResult = -pdFREERTOS_ERRNO_EADDRNOTAVAIL;
+    TimeOut_t xTimeOut;
+    MACAddress_t xMACAddress;
+    eARPLookupResult_t xLookupResult;
+    size_t uxSendCount = ipconfigMAX_ARP_RETRANSMISSIONS;
+
+    /* The IP-task is not supposed to call this function. */
+    configASSERT( xIsCallingFromIPTask() == pdFALSE );
+
+    xLookupResult = eARPGetCacheEntry( &( ulIPAddress ), &( xMACAddress ) );
+
+    if( xLookupResult == eARPCacheMiss )
+    {
+        const TickType_t uxSleepTime = pdMS_TO_TICKS( 250U );
+
+        /* We might use ipconfigMAX_ARP_RETRANSMISSIONS here. */
+        vTaskSetTimeOutState( &xTimeOut );
+
+        while( uxSendCount > 0 )
+        {
+            FreeRTOS_OutputARPRequest( ulIPAddress );
+
+            vTaskDelay( uxSleepTime );
+
+            xLookupResult = eARPGetCacheEntry( &( ulIPAddress ), &( xMACAddress ) );
+
+            if( ( xTaskCheckForTimeOut( &( xTimeOut ), &( uxTicksToWait ) ) == pdTRUE ) ||
+                ( xLookupResult != eARPCacheMiss ) )
+            {
+                break;
+            }
+        }
+    }
+
+    if( xLookupResult == eARPCacheHit )
+    {
+        xResult = 0;
+    }
+
+    return xResult;
+}
+/*-----------------------------------------------------------*/
 
 /**
  * @brief Generate an ARP request packet by copying various constant details to
diff --git a/include/FreeRTOS_IP.h b/include/FreeRTOS_IP.h
index 3354d6ae4f..48a900e359 100644
--- a/include/FreeRTOS_IP.h
+++ b/include/FreeRTOS_IP.h
@@ -330,6 +330,8 @@
     uint32_t FreeRTOS_GetGatewayAddress( void );
     uint32_t FreeRTOS_GetDNSServerAddress( void );
     uint32_t FreeRTOS_GetNetmask( void );
+    BaseType_t xARPWaitResolution( uint32_t ulIPAddress,
+                                   TickType_t uxTicksToWait );
     void FreeRTOS_OutputARPRequest( uint32_t ulIPAddress );
     BaseType_t FreeRTOS_IsNetworkUp( void );
 
diff --git a/test/unit-test/FreeRTOS_TCP_Unit_test.c b/test/unit-test/FreeRTOS_TCP_Unit_test.c
index a5782caf62..9bf19303e9 100644
--- a/test/unit-test/FreeRTOS_TCP_Unit_test.c
+++ b/test/unit-test/FreeRTOS_TCP_Unit_test.c
@@ -5,6 +5,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "FreeRTOS.h"
+#include "task.h"
+#include "list.h"
+
 /* Include header file(s) which have declaration
  * of functions under test */
 #include "FreeRTOS_IP.h"
diff --git a/test/unit-test/stubs/FreeRTOS_ARP_stubs.c b/test/unit-test/stubs/FreeRTOS_ARP_stubs.c
index 7b4b0b3b84..79b33a1701 100644
--- a/test/unit-test/stubs/FreeRTOS_ARP_stubs.c
+++ b/test/unit-test/stubs/FreeRTOS_ARP_stubs.c
@@ -12,6 +12,23 @@ NetworkAddressingParameters_t xNetworkAddressing = { 0, 0, 0, 0, 0 };
 /* The expected IP version and header length coded into the IP header itself. */
 #define ipIP_VERSION_AND_HEADER_LENGTH_BYTE    ( ( uint8_t ) 0x45 )
 
+void vTaskSetTimeOutState( TimeOut_t * const pxTimeOut )
+{
+}
+/*-----------------------------------------------------------*/
+
+BaseType_t xTaskCheckForTimeOut( TimeOut_t * const pxTimeOut,
+                                 TickType_t * const pxTicksToWait )
+{
+    return pdTRUE;
+}
+/*-----------------------------------------------------------*/
+
+void vTaskDelay( const TickType_t xTicksToDelay )
+{
+}
+/*-----------------------------------------------------------*/
+
 BaseType_t xIsIPv4Multicast( uint32_t ulIPAddress )
 {
     BaseType_t xReturn;