diff --git a/AcumaticaSmartsheetIntegration21R2.zip b/AcumaticaSmartsheetIntegration21R2.zip
new file mode 100644
index 0000000..c5d2ed3
Binary files /dev/null and b/AcumaticaSmartsheetIntegration21R2.zip differ
diff --git a/PX.SmartSheetIntegration/PM/SetupMaintExt.cs b/PX.SmartSheetIntegration/PM/SetupMaintExt.cs
index aa4ba04..46731cc 100644
--- a/PX.SmartSheetIntegration/PM/SetupMaintExt.cs
+++ b/PX.SmartSheetIntegration/PM/SetupMaintExt.cs
@@ -249,8 +249,11 @@ public Dictionary<string, string> GetTemplateSS(string refreshedToken = "")
                                                         .SetAccessToken(token.AccessToken)
                                                         .SetDateTimeFixOptOut(true) //See NOTE ON 2.93.0 RELEASE on https://github.com/smartsheet-platform/smartsheet-csharp-sdk
                                                         .Build();
-                PaginatedResult<Template> templates = smartsheetClient.TemplateResources.ListPublicTemplates(null);
-                PaginatedResult<Template> userTemplates = smartsheetClient.TemplateResources.ListUserCreatedTemplates(null);
+                
+                PaginationParameters paginationParams = new PaginationParameters(true, null, null); //includeAll = true ==> Ignoring paging and size if defined
+                PaginatedResult<Template> templates = smartsheetClient.TemplateResources.ListPublicTemplates(paginationParams);
+                PaginatedResult<Template> userTemplates = smartsheetClient.TemplateResources.ListUserCreatedTemplates(paginationParams);
+
                 if (templates.TotalCount > 0)
                 {
                     foreach (Template dataTemplate in templates.Data)