diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index e001b570b..dbd0fdb59 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -16,7 +16,7 @@ jobs:
   golangci:
     strategy:
       matrix:
-        go: [1.17]
+        go: [1.18]
         os: [ubuntu-latest, windows-latest, macos-latest]
     name: lint
     runs-on: ${{ matrix.os }}
@@ -24,12 +24,12 @@ jobs:
       - uses: actions/setup-go@v3
         with:
           go-version: ${{ matrix.go }}
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.46
+          version: latest
           # Optional: working directory, useful for monorepos
           # working-directory: somedir
 
diff --git a/cmd/copyEnumeratorInit.go b/cmd/copyEnumeratorInit.go
index 444c6b42f..7db16e16b 100755
--- a/cmd/copyEnumeratorInit.go
+++ b/cmd/copyEnumeratorInit.go
@@ -614,11 +614,6 @@ func (cca *CookedCopyCmdArgs) MakeEscapedRelativePath(source bool, dstIsDir bool
 		return pathEncodeRules(relativePath, cca.FromTo, cca.disableAutoDecoding, source)
 	}
 
-	// user is not placing the source as a subdir
-	if object.isSourceRootFolder() && !asSubdir {
-		relativePath = ""
-	}
-
 	// If it's out here, the object is contained in a folder, or was found via a wildcard, or object.isSourceRootFolder == true
 	if object.isSourceRootFolder() {
 		relativePath = "" // otherwise we get "/" from the line below, and that breaks some clients, e.g. blobFS
diff --git a/testSuite/scripts/utility.py b/testSuite/scripts/utility.py
index 8b25559a4..13eb28894 100644
--- a/testSuite/scripts/utility.py
+++ b/testSuite/scripts/utility.py
@@ -100,7 +100,7 @@ def execute_azcopy_info(self):
     def execute_testsuite_upload(self):
         return verify_operation(self.string())
 
-# processes oauth command according to swtiches
+# processes oauth command according to switches
 def process_oauth_command(
     cmd,
     fromTo=""):