Merging upstream version 1.31.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 7 insertions, 3 deletions

diff --git a/claim/README.md b/claim/README.md
index 1d0d6eebe..b3ebb8221 100644
--- a/claim/README.md
+++ b/claim/README.md
@@ -30,8 +30,8 @@ data is encrypted by TLS while it is in transit. We use the RSA keypair created
 identity of the Agent when it connects to the Cloud. While the data does flow through Netdata Cloud servers on its way
 from Agents to the browser, we do not store or log it.
 
-You can claim a node during the Cloud onboarding process, or after you created a Space by clicking on the **USER's
-Space** dropdown, then **Manage claimed nodes**.
+You can claim a node during the Netdata Cloud onboarding process, or after you created a Space by clicking on **Claim
+Nodes** in the [Spaces management area](https://learn.netdata.cloud/docs/cloud/spaces#manage-spaces).
 
 There are two important notes regarding claiming:
 
@@ -209,7 +209,7 @@ Netdata to `/opt/netdata`, use `/opt/netdata/bin/netdata-claim.sh` to run the cl
 
 If you are using an unsupported package, such as a third-party `.deb`/`.rpm` package provided by your distribution,
 please remove that package and reinstall using our [recommended kickstart
-script](/docs/get/README.md#install-the-netdata-agent).
+script](/docs/get-started.mdx#install-on-linux-with-one-line-installer-recommended).
 
 #### Claiming on older distributions (Ubuntu 14.04, Debian 8, CentOS 6)
 
diff --git a/claim/claim.c b/claim/claim.c
index 9a3660f9e..ce3f0803d 100644
--- a/claim/claim.c
+++ b/claim/claim.c
@@ -164,6 +164,10 @@ void load_claiming_state(void)
         claimed_id = NULL;
     }
     localhost->aclk_state.claimed_id = claimed_id;
+
+    invalidate_node_instances(&localhost->host_uuid, claimed_id ? &uuid : NULL);
+    store_claim_id(&localhost->host_uuid, claimed_id ? &uuid : NULL);
+
     rrdhost_aclk_state_unlock(localhost);
     if (!claimed_id) {
         info("Unable to load '%s', setting state to AGENT_UNCLAIMED", filename);