diff --git a/documentation/Get-PnPFileSharingLink.md b/documentation/Get-PnPFileSharingLink.md
index 02a2c32cf..4be26d674 100644
--- a/documentation/Get-PnPFileSharingLink.md
+++ b/documentation/Get-PnPFileSharingLink.md
@@ -10,7 +10,7 @@ title: Get-PnPFileSharingLink
 # Get-PnPFileSharingLink
 
 ## SYNOPSIS
-Retrieves sharing links to associated with the file.
+Retrieves sharing links to associated with the file or list item.
 
 ## SYNTAX
 
@@ -20,7 +20,7 @@ Get-PnPFileSharingLink -Identity <FilePipeBind> [-Verbose] [-Connection <PnPConn
 
 ## DESCRIPTION
 
-Retrieves sharing links for a file.
+Retrieves sharing links for a file or list item.
 
 ## EXAMPLES
 
@@ -46,6 +46,7 @@ Get-PnPListItem -List "Documents" | Get-PnPFileSharingLink
 This will fetch sharing links for all files in the `Documents` library.
 
 ### EXAMPLE 4
+
 ```powershell
 Get-PnPListItem -List "Documents" -Id 1 | Get-PnPFileSharingLink
 ```
@@ -73,6 +74,13 @@ Get-PnPFileInFolder -Recurse -ExcludeSystemFolders -FolderSiteRelativeUrl "Share
 
 This will fetch sharing links for all files in the `Shared Documents` library, including the files in subfolders, excluding the ones in hidden internal system folders where no expiration has been set on the sharing of the file.
 
+### EXAMPLE 8
+```powershell	
+Get-PnPFileSharingLink -Identity /sites/demo/Lists/Issue tracker/1_.000
+```
+
+This will fetch sharing links for the list item with id `1` from list `Issue Tracker`
+
 ## PARAMETERS
 
 ### -Connection
diff --git a/documentation/Set-PnPTenant.md b/documentation/Set-PnPTenant.md
index c73b7383c..5285e31ff 100644
--- a/documentation/Set-PnPTenant.md
+++ b/documentation/Set-PnPTenant.md
@@ -157,6 +157,8 @@ Set-PnPTenant [-SpecialCharactersStateInFileFolderNames <SpecialCharactersState>
  [-IsSharePointAddInsDisabled <Boolean>]
  [-CoreDefaultShareLinkScope <SharingScope>]
  [-CoreDefaultShareLinkRole <Role>] 
+ [-GuestSharingGroupAllowListInTenantByPrincipalIdentity <string[]>]
+ [-OneDriveSharingCapability <SharingCapabilities>]
  [-Force] [-Connection <PnPConnection>]
 ```
 
@@ -196,6 +198,20 @@ Set-PnPTenant -UsePersistentCookiesForExplorerView $true
 
 This example enables the use of special persisted cookie for Open with Explorer.
 
+### EXAMPLE 5
+```powershell
+Set-PnPTenant  -GuestSharingGroupAllowListInTenantByPrincipalIdentity {c:0o.c|federateddirectoryclaimprovider|ee0f40fc-b2f7-45c7-b62d-11b90dd2ea8e}
+```
+
+This example sets the guest sharing group allow list in the tenant to the specified principal identity.
+
+### EXAMPLE 6
+```powershell
+Set-PnPTenant  -GuestSharingGroupAllowListInTenantByPrincipalIdentity {}
+```
+
+This example clears the guest sharing group allow list in the tenant.
+
 ## PARAMETERS
 
 ### -AllowDownloadingNonWebViewableFiles
@@ -1155,8 +1171,11 @@ Accept wildcard characters: False
 Determines what level of sharing is available for the site.
 
 The valid values are:
-ExternalUserAndGuestSharing (default) - External user sharing (share by email) and guest link sharing are both enabled. Disabled - External user sharing (share by email) and guest link sharing are both disabled.
-ExternalUserSharingOnly - External user sharing (share by email) is enabled, but guest link sharing is disabled.
+
+- ExternalUserAndGuestSharing (default) : External user sharing (share by email) and guest link sharing are both enabled. 
+- Disabled : External user sharing (share by email) and guest link sharing are both disabled.
+- ExternalUserSharingOnly : External user sharing (share by email) is enabled, but guest link sharing is disabled.
+- ExistingExternalUserSharingOnly : Only guests already in your organization's directory.
 
 For more information about sharing, see Manage external sharing for your SharePoint online environment (https://learn.microsoft.com/sharepoint/turn-external-sharing-on-or-off).
 
@@ -1736,14 +1755,15 @@ Gets or sets collaboration type for fluid on core partition
 
 The valid values are:
 
-- Disabled
-- ExternalUserSharingOnly
-- ExternalUserAndGuestSharing
-- ExistingExternalUserSharingOnly
+- ExternalUserAndGuestSharing (default) : External user sharing (share by email) and guest link sharing are both enabled.
+- Disabled : External user sharing (share by email) and guest link sharing are both disabled.
+- ExternalUserSharingOnly : External user sharing (share by email) is enabled, but guest link sharing is disabled.
+- ExistingExternalUserSharingOnly : Only guests already in your organization's directory.
 
 ```yaml
 Type: SharingCapabilities
 Parameter Sets: (All)
+Accepted values: Disabled, ExternalUserSharingOnly, ExternalUserAndGuestSharing, ExistingExternalUserSharingOnly
 
 Required: False
 Position: Named
@@ -1762,14 +1782,16 @@ If you have the external sharing for OneDrive for Business allowed, no further a
 
 The valid values are:
 
-- Disabled
-- ExternalUserSharingOnly
-- ExternalUserAndGuestSharing
-- ExistingExternalUserSharingOnly
+- ExternalUserAndGuestSharing (default) : External user sharing (share by email) and guest link sharing are both enabled.
+- Disabled : External user sharing (share by email) and guest link sharing are both disabled.
+- ExternalUserSharingOnly : External user sharing (share by email) is enabled, but guest link sharing is disabled.
+- ExistingExternalUserSharingOnly : Only guests already in your organization's directory.
+
 
 ```yaml
 Type: SharingCapabilities
 Parameter Sets: (All)
+Accepted values: Disabled, ExternalUserSharingOnly, ExternalUserAndGuestSharing, ExistingExternalUserSharingOnly
 
 Required: False
 Position: Named
@@ -2403,6 +2425,14 @@ Accept wildcard characters: False
 ### -CoreSharingCapability
 Sets what level of sharing is available for SharePoint sites (not including OneDrive sites).
 
+The valid values are:
+
+- ExternalUserAndGuestSharing (default) : External user sharing (share by email) and guest link sharing are both enabled.
+- Disabled : External user sharing (share by email) and guest link sharing are both disabled.
+- ExternalUserSharingOnly : External user sharing (share by email) is enabled, but guest link sharing is disabled.
+- ExistingExternalUserSharingOnly : Only guests already in your organization's directory.
+
+
 ```yaml
 Type: SharingCapabilities
 Parameter Sets: (All)
@@ -2726,6 +2756,45 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -OneDriveSharingCapability
+
+Determines what level of sharing is available for  OneDrive for Business.
+
+The valid values are:
+
+- ExternalUserAndGuestSharing (default) : External user sharing (share by email) and guest link sharing are both enabled. 
+- Disabled : External user sharing (share by email) and guest link sharing are both disabled.
+- ExternalUserSharingOnly : External user sharing (share by email) is enabled, but guest link sharing is disabled.
+- ExistingExternalUserSharingOnly : Only guests already in your organization's directory.
+
+For more information about sharing, see Manage external sharing for your SharePoint online environment (https://learn.microsoft.com/sharepoint/turn-external-sharing-on-or-off).
+
+```yaml
+Type: SharingCapabilities
+Parameter Sets: (All)
+Accepted values: Disabled, ExternalUserSharingOnly, ExternalUserAndGuestSharing, ExistingExternalUserSharingOnly
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -GuestSharingGroupAllowListInTenantByPrincipalIdentity
+Sets the guest sharing group allow list in the tenant by principal identity.
+
+```yaml
+Type: String[]
+Parameter Sets: (All)
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -Force
 If provided, no confirmation will be requested and the action will be performed
 
diff --git a/src/Commands/Admin/SetTenant.cs b/src/Commands/Admin/SetTenant.cs
index a1e63f8f5..451a4916d 100644
--- a/src/Commands/Admin/SetTenant.cs
+++ b/src/Commands/Admin/SetTenant.cs
@@ -477,6 +477,12 @@ public class SetTenant : PnPAdminCmdlet
 
         [Parameter(Mandatory = false)]
         public Role? CoreDefaultShareLinkRole { private set; get; }
+        
+        [Parameter(Mandatory = false)]
+        public SharingCapabilities? OneDriveSharingCapability { private set; get; }
+        
+        [Parameter(Mandatory = false)]
+        public string[] GuestSharingGroupAllowListInTenantByPrincipalIdentity { private set; get; }
 
         protected override void ExecuteCmdlet()
         {
@@ -1532,6 +1538,26 @@ protected override void ExecuteCmdlet()
                 Tenant.CoreDefaultShareLinkRole = CoreDefaultShareLinkRole.Value;
                 modified = true;
             }
+            if(OneDriveSharingCapability.HasValue)
+            {
+                Tenant.ODBSharingCapability = OneDriveSharingCapability.Value;
+                modified = true;
+            }
+            if (GuestSharingGroupAllowListInTenantByPrincipalIdentity !=null)
+            {
+                if (GuestSharingGroupAllowListInTenantByPrincipalIdentity.Length > 0)
+                {
+                    if (!string.IsNullOrEmpty(GuestSharingGroupAllowListInTenantByPrincipalIdentity[0].ToString()))
+                    {
+                        Tenant.GuestSharingGroupAllowListInTenantByPrincipalIdentity = GuestSharingGroupAllowListInTenantByPrincipalIdentity;
+                    }
+                    else
+                    {
+                        Tenant.GuestSharingGroupAllowListInTenantByPrincipalIdentity = new string[0];
+                    }
+                }
+                modified = true;
+            }
             if (BlockDownloadFileTypePolicy.HasValue)
             {
                 if (!BlockDownloadFileTypePolicy.Value)
diff --git a/src/Commands/Model/SPOTenant.cs b/src/Commands/Model/SPOTenant.cs
index 657b85ff0..0bac35231 100644
--- a/src/Commands/Model/SPOTenant.cs
+++ b/src/Commands/Model/SPOTenant.cs
@@ -248,9 +248,11 @@ public class SPOTenant
         public SharingScope? CoreDefaultShareLinkScope { private set; get; }
         public Role? CoreDefaultShareLinkRole { private set; get; }
         public bool? SharePointAddInsDisabled { private set; get; }
-    #endregion
+        public SharingCapabilities? OneDriveSharingCapability { private set; get; }
+        public string[] GuestSharingGroupAllowListInTenantByPrincipalIdentity { private set; get; }
+        #endregion
 
-    public SPOTenant(Tenant tenant, ClientContext clientContext)
+        public SPOTenant(Tenant tenant, ClientContext clientContext)
         {
             HideDefaultThemes = tenant.HideDefaultThemes;
             StorageQuota = tenant.StorageQuota;
@@ -785,6 +787,8 @@ public SPOTenant(Tenant tenant, ClientContext clientContext)
             try { CoreDefaultShareLinkScope = tenant.CoreDefaultShareLinkScope; } catch { }
             try { CoreDefaultShareLinkRole = tenant.CoreDefaultShareLinkRole; } catch { }
             try { SharePointAddInsDisabled = tenant.SharePointAddInsDisabled; } catch { }
+            try { OneDriveSharingCapability = tenant.ODBSharingCapability; } catch { }
+            try { GuestSharingGroupAllowListInTenantByPrincipalIdentity = tenant.GuestSharingGroupAllowListInTenantByPrincipalIdentity?.ToArray(); } catch { }
         }
     }
 }