Merge "Adding stacked link addresses to local_net_access map" into main