Address the merge request comments.

1 job for move-nestmates-to-experimental-api in 3 minutes and 54 seconds (queued for 3 seconds)