From 4edf7d6d232317f759d33ad0527febbcc0cb8b3e Mon Sep 17 00:00:00 2001
From: SONIC-ADMIN <sa@infinera.com>
Date: Tue, 23 Dec 2025 19:45:03 +0530
Subject: [PATCH 1/2] Concatenate payload bytes for multiple responses in REST
 handler

---
 rest/server/handler.go | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/rest/server/handler.go b/rest/server/handler.go
index 584a09dc1b..816e884ede 100644
--- a/rest/server/handler.go
+++ b/rest/server/handler.go
@@ -316,7 +316,10 @@ func invokeTranslib(args *translibArgs, rc *RequestContext) (int, []byte, error)
 		resp, err1 := translib.Get(req)
 		if err1 == nil {
 			status = 200
-			content = []byte(resp.Payload)
+                        for _, iter := range resp {
+                                byteresp := []byte(iter.Payload)
+                                content = append(content, byteresp...)
+                        }
 		} else {
 			err = err1
 		}
@@ -367,8 +370,11 @@ func invokeTranslib(args *translibArgs, rc *RequestContext) (int, []byte, error)
 		}
 		res, err1 := translib.Action(req)
 		if err1 == nil {
-			status = 200
-			content = res.Payload
+                        status = 200
+                        for _, iter := range res {
+                                byteresp := []byte(iter.Payload)
+                                content = append(content, byteresp...)
+                        }
 		} else {
 			err = err1
 		}

From 92701b61d58e87edee43fa2d3192a2dd96b683de Mon Sep 17 00:00:00 2001
From: maheswari <sa@infinera.com>
Date: Thu, 9 Jul 2026 13:27:41 +0530
Subject: [PATCH 2/2] Configurable Rollback Support

---
 rest/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/rest/Makefile b/rest/Makefile
index 5bfaca54a8..30b86e7b2a 100644
--- a/rest/Makefile
+++ b/rest/Makefile
@@ -21,6 +21,10 @@ TOPDIR     := ..
 BUILD_DIR  ?= $(TOPDIR)/build
 
 GO     ?= go
+TRANSLIB_LDFLAGS ?=
+ifeq ($(strip $(ENABLE_TRANSLIB_ROLLBACK)),y)
+TRANSLIB_LDFLAGS += -X github.com/Azure/sonic-mgmt-common/translib.ENABLE_TRANSLIB_ROLLBACK=true
+endif
 GOROOT ?= $(shell $(GO) env GOROOT)
 
 REST_BUILD_DIR := $(BUILD_DIR)/rest_server
@@ -59,7 +63,7 @@ $(REST_BIN): $(REST_SRCS) | $(REST_BUILD_DIR)/
 ifeq ($(SONIC_COVERAGE_ON),y)
 	$(GO) test -mod=vendor -coverpkg="./..." -c -o $@ ../rest/main/main.go ../rest/main/main_test.go
 else
-	$(GO) build -mod=vendor -gcflags="all=-N -l" -v -o $@ ../rest/main/main.go
+	$(GO) build -mod=vendor -gcflags="all=-N -l" -v -o $@ -ldflags "$(TRANSLIB_LDFLAGS)" ../rest/main/main.go
 endif
 
 # Gotest binary for REST Server