diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml
index cc3b541969..52eb569d12 100644
--- a/.github/workflows/dev-build.yml
+++ b/.github/workflows/dev-build.yml
@@ -58,8 +58,9 @@ jobs:
         run: |
           NAME="mm2_$KDF_BUILD_TAG-linux-x86-64.zip"
           zip $NAME target/release/mm2 -j
-          mkdir $BRANCH_NAME
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mkdir $SAFE_DIR_NAME
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Compress kdf build output
         env:
@@ -68,7 +69,8 @@ jobs:
         run: |
           NAME="kdf_$KDF_BUILD_TAG-linux-x86-64.zip"
           zip $NAME target/release/kdf -j
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Upload build artifact
         env:
@@ -77,7 +79,9 @@ jobs:
           FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
           FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.FILE_SERVER_KEY != '' }}
-        run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
+        run: |
+          SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
 
       - name: Login to dockerhub
         if: github.event_name != 'pull_request' && github.ref == 'refs/heads/dev'
@@ -128,9 +132,9 @@ jobs:
         run: |
           NAME="mm2_$KDF_BUILD_TAG-mac-x86-64.zip"
           zip $NAME target/x86_64-apple-darwin/release/mm2 -j
-          mkdir $BRANCH_NAME
-          mv $NAME ./$BRANCH_NAME/
-
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mkdir $SAFE_DIR_NAME
+          mv $NAME ./$SAFE_DIR_NAME/
       - name: Compress kdf build output
         env:
           AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
@@ -138,7 +142,8 @@ jobs:
         run: |
           NAME="kdf_$KDF_BUILD_TAG-mac-x86-64.zip"
           zip $NAME target/x86_64-apple-darwin/release/kdf -j
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Upload build artifact
         env:
@@ -147,7 +152,9 @@ jobs:
           FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
           FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.FILE_SERVER_KEY != '' }}
-        run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
+        run: |
+          SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
 
   mac-arm64:
     timeout-minutes: 60
@@ -186,8 +193,9 @@ jobs:
         run: |
           NAME="mm2_$KDF_BUILD_TAG-mac-arm64.zip"
           zip $NAME target/aarch64-apple-darwin/release/mm2 -j
-          mkdir $BRANCH_NAME
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mkdir $SAFE_DIR_NAME
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Compress kdf build output
         env:
@@ -196,7 +204,8 @@ jobs:
         run: |
           NAME="kdf_$KDF_BUILD_TAG-mac-arm64.zip"
           zip $NAME target/aarch64-apple-darwin/release/kdf -j
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Upload build artifact
         env:
@@ -205,7 +214,9 @@ jobs:
           FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
           FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.FILE_SERVER_KEY != '' }}
-        run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
+        run: |
+          SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
 
   win-x86-64:
     timeout-minutes: 60
@@ -243,8 +254,9 @@ jobs:
         run: |
           $NAME="mm2_$Env:KDF_BUILD_TAG-win-x86-64.zip"
           7z a $NAME .\target\release\mm2.exe .\target\release\*.dll
-          mkdir $Env:BRANCH_NAME
-          mv $NAME ./$Env:BRANCH_NAME/
+          $SAFE_DIR_NAME = $Env:BRANCH_NAME -replace '/', '-'
+          mkdir $SAFE_DIR_NAME
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Compress kdf build output
         env:
@@ -253,7 +265,8 @@ jobs:
         run: |
           $NAME="kdf_$Env:KDF_BUILD_TAG-win-x86-64.zip"
           7z a $NAME .\target\release\kdf.exe .\target\release\*.dll
-          mv $NAME ./$Env:BRANCH_NAME/
+          $SAFE_DIR_NAME = $Env:BRANCH_NAME -replace '/', '-'
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Upload build artifact
         env:
@@ -262,7 +275,9 @@ jobs:
           FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
           FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.FILE_SERVER_KEY != '' }}
-        run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
+        run: |
+          $SAFE_BRANCH_NAME = $Env:BRANCH_NAME -replace '/', '-'
+          python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
 
   mac-dylib-x86-64:
     timeout-minutes: 60
@@ -302,8 +317,9 @@ jobs:
           NAME="mm2_$KDF_BUILD_TAG-mac-dylib-x86-64.zip"
           cp target/x86_64-apple-darwin/release/libkdflib.a target/x86_64-apple-darwin/release/libmm2.a
           zip $NAME target/x86_64-apple-darwin/release/libmm2.a -j
-          mkdir $BRANCH_NAME
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mkdir $SAFE_DIR_NAME
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Compress kdf build output
         env:
@@ -313,7 +329,8 @@ jobs:
           NAME="kdf_$KDF_BUILD_TAG-mac-dylib-x86-64.zip"
           mv target/x86_64-apple-darwin/release/libkdflib.a target/x86_64-apple-darwin/release/libkdf.a
           zip $NAME target/x86_64-apple-darwin/release/libkdf.a -j
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Upload build artifact
         env:
@@ -322,7 +339,9 @@ jobs:
           FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
           FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.FILE_SERVER_KEY != '' }}
-        run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
+        run: |
+          SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
 
   wasm:
     timeout-minutes: 60
@@ -374,8 +393,9 @@ jobs:
         run: |
           NAME="kdf_$KDF_BUILD_TAG-wasm.zip"
           (cd ./target/target-wasm-release && zip -r - .) > $NAME
-          mkdir $BRANCH_NAME
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mkdir $SAFE_DIR_NAME
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Upload build artifact
         env:
@@ -384,7 +404,9 @@ jobs:
           FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
           FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.FILE_SERVER_KEY != '' }}
-        run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
+        run: |
+          SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
 
   ios-aarch64:
     timeout-minutes: 60
@@ -424,8 +446,9 @@ jobs:
           NAME="mm2_$KDF_BUILD_TAG-ios-aarch64.zip"
           cp target/aarch64-apple-ios/release/libkdflib.a target/aarch64-apple-ios/release/libmm2.a
           zip $NAME target/aarch64-apple-ios/release/libmm2.a -j
-          mkdir $BRANCH_NAME
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mkdir $SAFE_DIR_NAME
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Compress kdf build output
         env:
@@ -435,7 +458,8 @@ jobs:
           NAME="kdf_$KDF_BUILD_TAG-ios-aarch64.zip"
           mv target/aarch64-apple-ios/release/libkdflib.a target/aarch64-apple-ios/release/libkdf.a
           zip $NAME target/aarch64-apple-ios/release/libkdf.a -j
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Upload build artifact
         env:
@@ -444,7 +468,9 @@ jobs:
           FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
           FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.FILE_SERVER_KEY != '' }}
-        run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
+        run: |
+          SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
 
   android-aarch64:
     timeout-minutes: 60
@@ -498,8 +524,9 @@ jobs:
           NAME="mm2_$KDF_BUILD_TAG-android-aarch64.zip"
           cp target/aarch64-linux-android/release/libkdflib.a target/aarch64-linux-android/release/libmm2.a
           zip $NAME target/aarch64-linux-android/release/libmm2.a -j
-          mkdir $BRANCH_NAME
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mkdir $SAFE_DIR_NAME
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Compress kdf build output
         env:
@@ -509,7 +536,8 @@ jobs:
           NAME="kdf_$KDF_BUILD_TAG-android-aarch64.zip"
           mv target/aarch64-linux-android/release/libkdflib.a target/aarch64-linux-android/release/libkdf.a
           zip $NAME target/aarch64-linux-android/release/libkdf.a -j
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Upload build artifact
         env:
@@ -518,7 +546,9 @@ jobs:
           FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
           FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.FILE_SERVER_KEY != '' }}
-        run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
+        run: |
+          SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
 
   android-armv7:
     timeout-minutes: 60
@@ -572,8 +602,9 @@ jobs:
           NAME="mm2_$KDF_BUILD_TAG-android-armv7.zip"
           cp target/armv7-linux-androideabi/release/libkdflib.a target/armv7-linux-androideabi/release/libmm2.a
           zip $NAME target/armv7-linux-androideabi/release/libmm2.a -j
-          mkdir $BRANCH_NAME
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mkdir $SAFE_DIR_NAME
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Compress kdf build output
         env:
@@ -583,7 +614,8 @@ jobs:
           NAME="kdf_$KDF_BUILD_TAG-android-armv7.zip"
           mv target/armv7-linux-androideabi/release/libkdflib.a target/armv7-linux-androideabi/release/libkdf.a
           zip $NAME target/armv7-linux-androideabi/release/libkdf.a -j
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Upload build artifact
         env:
@@ -592,7 +624,9 @@ jobs:
           FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
           FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.FILE_SERVER_KEY != '' }}
-        run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
+        run: |
+          SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
 
   deployment-commitment:
     if: github.event_name != 'pull_request' && github.ref == 'refs/heads/dev'
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index f1cdda82df..5507461f55 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -55,14 +55,16 @@ jobs:
         run: |
           NAME="mm2_$KDF_BUILD_TAG-linux-x86-64.zip"
           zip $NAME target/release/mm2 -j
-          mkdir $BRANCH_NAME
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mkdir $SAFE_DIR_NAME
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Compress kdf build output
         run: |
           NAME="kdf_$KDF_BUILD_TAG-linux-x86-64.zip"
           zip $NAME target/release/kdf -j
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Upload build artifact
         env:
@@ -71,7 +73,9 @@ jobs:
           FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
           FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.FILE_SERVER_KEY != '' }}
-        run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
+        run: |
+          SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
 
       - name: Login to dockerhub
         run: docker login --username ${{ secrets.DOCKER_HUB_USERNAME }} --password ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}  docker.io
@@ -116,14 +120,16 @@ jobs:
         run: |
           NAME="mm2_$KDF_BUILD_TAG-mac-x86-64.zip"
           zip $NAME target/x86_64-apple-darwin/release/mm2 -j
-          mkdir $BRANCH_NAME
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mkdir $SAFE_DIR_NAME
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Compress kdf build output
         run: |
           NAME="kdf_$KDF_BUILD_TAG-mac-x86-64.zip"
           zip $NAME target/x86_64-apple-darwin/release/kdf -j
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Upload build artifact
         env:
@@ -132,7 +138,9 @@ jobs:
           FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
           FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.FILE_SERVER_KEY != '' }}
-        run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
+        run: |
+          SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
 
   mac-arm64:
     timeout-minutes: 60
@@ -168,14 +176,16 @@ jobs:
         run: |
           NAME="mm2_$KDF_BUILD_TAG-mac-arm64.zip"
           zip $NAME target/aarch64-apple-darwin/release/mm2 -j
-          mkdir $BRANCH_NAME
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mkdir $SAFE_DIR_NAME
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Compress kdf build output
         run: |
           NAME="kdf_$KDF_BUILD_TAG-mac-arm64.zip"
           zip $NAME target/aarch64-apple-darwin/release/kdf -j
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Upload build artifact
         env:
@@ -184,7 +194,9 @@ jobs:
           FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
           FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.FILE_SERVER_KEY != '' }}
-        run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
+        run: |
+          SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
 
   win-x86-64:
     timeout-minutes: 60
@@ -219,14 +231,16 @@ jobs:
         run: |
           $NAME="mm2_$Env:KDF_BUILD_TAG-win-x86-64.zip"
           7z a $NAME .\target\release\mm2.exe .\target\release\*.dll
-          mkdir $Env:BRANCH_NAME
-          mv $NAME ./$Env:BRANCH_NAME/
+          $SAFE_DIR_NAME = $Env:BRANCH_NAME -replace '/', '-'
+          mkdir $SAFE_DIR_NAME
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Compress kdf build output
         run: |
           $NAME="kdf_$Env:KDF_BUILD_TAG-win-x86-64.zip"
           7z a $NAME .\target\release\kdf.exe .\target\release\*.dll
-          mv $NAME ./$Env:BRANCH_NAME/
+          $SAFE_DIR_NAME = $Env:BRANCH_NAME -replace '/', '-'
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Upload build artifact
         env:
@@ -235,7 +249,9 @@ jobs:
           FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
           FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.FILE_SERVER_KEY != '' }}
-        run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
+        run: |
+          $SAFE_BRANCH_NAME = $Env:BRANCH_NAME -replace '/', '-'
+          python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
 
   mac-dylib-x86-64:
     timeout-minutes: 60
@@ -271,15 +287,17 @@ jobs:
           NAME="mm2_$KDF_BUILD_TAG-mac-dylib-x86-64.zip"
           cp target/x86_64-apple-darwin/release/libkdflib.a target/x86_64-apple-darwin/release/libmm2.a
           zip $NAME target/x86_64-apple-darwin/release/libmm2.a -j
-          mkdir $BRANCH_NAME
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mkdir $SAFE_DIR_NAME
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Compress kdf build output
         run: |
           NAME="kdf_$KDF_BUILD_TAG-mac-dylib-x86-64.zip"
           mv target/x86_64-apple-darwin/release/libkdflib.a target/x86_64-apple-darwin/release/libkdf.a
           zip $NAME target/x86_64-apple-darwin/release/libkdf.a -j
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Upload build artifact
         env:
@@ -288,7 +306,9 @@ jobs:
           FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
           FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.FILE_SERVER_KEY != '' }}
-        run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
+        run: |
+          SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
 
   wasm:
     timeout-minutes: 60
@@ -337,8 +357,9 @@ jobs:
         run: |
           NAME="kdf_$KDF_BUILD_TAG-wasm.zip"
           (cd ./target/target-wasm-release && zip -r - .) > $NAME
-          mkdir $BRANCH_NAME
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mkdir $SAFE_DIR_NAME
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Upload build artifact
         env:
@@ -347,7 +368,9 @@ jobs:
           FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
           FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.FILE_SERVER_KEY != '' }}
-        run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
+        run: |
+          SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
 
   ios-aarch64:
     timeout-minutes: 60
@@ -384,15 +407,17 @@ jobs:
           NAME="mm2_$KDF_BUILD_TAG-ios-aarch64.zip"
           mv target/aarch64-apple-ios/release/libkdflib.a target/aarch64-apple-ios/release/libmm2.a
           zip $NAME target/aarch64-apple-ios/release/libmm2.a -j
-          mkdir $BRANCH_NAME
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mkdir $SAFE_DIR_NAME
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Compress kdf build output
         run: |
           NAME="kdf_$KDF_BUILD_TAG-ios-aarch64.zip"
           mv target/aarch64-apple-ios/release/libkdflib.a target/aarch64-apple-ios/release/libkdf.a
           zip $NAME target/aarch64-apple-ios/release/libkdf.a -j
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Upload build artifact
         env:
@@ -401,7 +426,9 @@ jobs:
           FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
           FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.FILE_SERVER_KEY != '' }}
-        run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
+        run: |
+          SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
 
   android-aarch64:
     timeout-minutes: 60
@@ -452,15 +479,17 @@ jobs:
           NAME="mm2_$KDF_BUILD_TAG-android-aarch64.zip"
           mv target/aarch64-linux-android/release/libkdflib.a target/aarch64-linux-android/release/libmm2.a
           zip $NAME target/aarch64-linux-android/release/libmm2.a -j
-          mkdir $BRANCH_NAME
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mkdir $SAFE_DIR_NAME
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Compress kdf build output
         run: |
           NAME="kdf_$KDF_BUILD_TAG-android-aarch64.zip"
           mv target/aarch64-linux-android/release/libkdflib.a target/aarch64-linux-android/release/libkdf.a
           zip $NAME target/aarch64-linux-android/release/libkdf.a  -j
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Upload build artifact
         env:
@@ -469,7 +498,9 @@ jobs:
           FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
           FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.FILE_SERVER_KEY != '' }}
-        run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
+        run: |
+          SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
 
   android-armv7:
     timeout-minutes: 60
@@ -520,15 +551,17 @@ jobs:
           NAME="mm2_$KDF_BUILD_TAG-android-armv7.zip"
           mv target/armv7-linux-androideabi/release/libkdflib.a target/armv7-linux-androideabi/release/libmm2.a
           zip $NAME target/armv7-linux-androideabi/release/libmm2.a -j
-          mkdir $BRANCH_NAME
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mkdir $SAFE_DIR_NAME
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Compress kdf build output
         run: |
           NAME="kdf_$KDF_BUILD_TAG-android-armv7.zip"
           mv target/armv7-linux-androideabi/release/libkdflib.a target/armv7-linux-androideabi/release/libkdf.a
           zip $NAME target/armv7-linux-androideabi/release/libkdf.a   -j
-          mv $NAME ./$BRANCH_NAME/
+          SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          mv $NAME ./$SAFE_DIR_NAME/
 
       - name: Upload build artifact
         env:
@@ -537,4 +570,6 @@ jobs:
           FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
           FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
         if: ${{ env.FILE_SERVER_KEY != '' }}
-        run: python3 ./scripts/ci/upload_artifact.py "${{ env.BRANCH_NAME }}" "/uploads/${{ env.BRANCH_NAME }}"
+        run: |
+          SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
+          python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
diff --git a/mm2src/mm2_main/src/lp_swap.rs b/mm2src/mm2_main/src/lp_swap.rs
index 76db714b3f..859e58140f 100644
--- a/mm2src/mm2_main/src/lp_swap.rs
+++ b/mm2src/mm2_main/src/lp_swap.rs
@@ -1099,6 +1099,8 @@ struct MySwapStatusResponse {
     my_info: Option<MySwapInfo>,
     recoverable: bool,
     is_finished: bool,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    is_success: Option<bool>,
 }
 
 impl From<SavedSwap> for MySwapStatusResponse {
@@ -1108,6 +1110,8 @@ impl From<SavedSwap> for MySwapStatusResponse {
             my_info: swap.get_my_info(),
             recoverable: swap.is_recoverable(),
             is_finished: swap.is_finished(),
+            // only serialize is_success field if swap is successful
+            is_success: swap.is_success().ok(),
             swap,
         }
     }
diff --git a/mm2src/mm2_main/src/lp_swap/saved_swap.rs b/mm2src/mm2_main/src/lp_swap/saved_swap.rs
index c471f7eacb..185edd1584 100644
--- a/mm2src/mm2_main/src/lp_swap/saved_swap.rs
+++ b/mm2src/mm2_main/src/lp_swap/saved_swap.rs
@@ -45,13 +45,15 @@ impl From<TakerSavedSwap> for SavedSwap {
 }
 
 impl SavedSwap {
-    pub fn is_finished_and_success(&self) -> bool {
+    pub fn is_success(&self) -> Result<bool, String> {
         match self {
-            SavedSwap::Maker(swap) => swap.is_success().unwrap_or(false),
-            SavedSwap::Taker(swap) => swap.is_success().unwrap_or(false),
+            SavedSwap::Maker(swap) => swap.is_success(),
+            SavedSwap::Taker(swap) => swap.is_success(),
         }
     }
 
+    pub fn is_finished_and_success(&self) -> bool { self.is_success().unwrap_or(false) }
+
     pub fn is_finished(&self) -> bool {
         match self {
             SavedSwap::Maker(swap) => swap.is_finished(),