diff --git a/webapp/package-lock.json b/webapp/package-lock.json
index 59d242bee5..b99b572bbd 100644
--- a/webapp/package-lock.json
+++ b/webapp/package-lock.json
@@ -150,13 +150,15 @@
       "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
       "dev": true,
       "requires": {
-        "kind-of": "^6.0.3",
+        "kind-of": "^3.0.2",
         "longest": "^1.0.1",
         "repeat-string": "^1.5.2"
       },
       "dependencies": {
         "kind-of": {
-          "version": "^6.0.3",
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
           "dev": true
         }
       }
@@ -293,11 +295,13 @@
               "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
               "dev": true,
               "requires": {
-                "kind-of": "^6.0.3"
+                "kind-of": "^3.0.2"
               },
               "dependencies": {
                 "kind-of": {
-                  "version": "^6.0.3",
+                  "version": "6.0.3",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+                  "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
                   "dev": true
                 }
               }
@@ -308,11 +312,13 @@
               "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
               "dev": true,
               "requires": {
-                "kind-of": "^6.0.3"
+                "kind-of": "^3.0.2"
               },
               "dependencies": {
                 "kind-of": {
-                  "version": "^6.0.3",
+                  "version": "6.0.3",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+                  "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
                   "dev": true
                 }
               }
@@ -325,17 +331,21 @@
               "requires": {
                 "is-accessor-descriptor": "^0.1.6",
                 "is-data-descriptor": "^0.1.4",
-                "kind-of": "^6.0.3"
+                "kind-of": "^5.0.0"
               },
               "dependencies": {
                 "kind-of": {
-                  "version": "^6.0.3",
+                  "version": "6.0.3",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+                  "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
                   "dev": true
                 }
               }
             },
             "kind-of": {
-              "version": "^6.0.3"
+              "version": "6.0.3",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
             }
           }
         },
@@ -425,11 +435,13 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.3"
+            "kind-of": "^6.0.0"
           },
           "dependencies": {
             "kind-of": {
-              "version": "^6.0.3",
+              "version": "6.0.3",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
               "dev": true
             }
           }
@@ -440,11 +452,13 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.3"
+            "kind-of": "^6.0.0"
           },
           "dependencies": {
             "kind-of": {
-              "version": "^6.0.3",
+              "version": "6.0.3",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
               "dev": true
             }
           }
@@ -457,11 +471,13 @@
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.3"
+            "kind-of": "^6.0.2"
           },
           "dependencies": {
             "kind-of": {
-              "version": "^6.0.3",
+              "version": "6.0.3",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
               "dev": true
             }
           }
@@ -472,11 +488,13 @@
           "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.3"
+            "kind-of": "^3.0.2"
           },
           "dependencies": {
             "kind-of": {
-              "version": "^6.0.3",
+              "version": "6.0.3",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
               "dev": true
             }
           }
@@ -488,7 +506,9 @@
           "dev": true
         },
         "kind-of": {
-          "version": "^6.0.3"
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
         },
         "micromatch": {
           "version": "3.1.10",
@@ -503,7 +523,7 @@
             "extend-shallow": "^3.0.2",
             "extglob": "^2.0.4",
             "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.3",
+            "kind-of": "^6.0.2",
             "nanomatch": "^1.2.9",
             "object.pick": "^1.3.0",
             "regex-not": "^1.0.0",
@@ -512,7 +532,9 @@
           },
           "dependencies": {
             "kind-of": {
-              "version": "^6.0.3",
+              "version": "6.0.3",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
               "dev": true
             }
           }
@@ -1022,7 +1044,9 @@
       },
       "dependencies": {
         "minimist": {
-          "version": "^0.2.1"
+          "version": "0.2.4",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.4.tgz",
+          "integrity": "sha512-Pkrrm8NjyQ8yVt8Am9M+yUt74zE3iokhzbG1bFVNjLB92vwM71hf40RkEsryg98BujhVOncKm/C1xROxZ030LQ=="
         },
         "mkdirp": {
           "version": "0.5.5",
@@ -1030,11 +1054,13 @@
           "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
           "dev": true,
           "requires": {
-            "minimist": "^0.2.1"
+            "minimist": "^1.2.5"
           },
           "dependencies": {
             "minimist": {
-              "version": "^0.2.1",
+              "version": "0.2.4",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.4.tgz",
+              "integrity": "sha512-Pkrrm8NjyQ8yVt8Am9M+yUt74zE3iokhzbG1bFVNjLB92vwM71hf40RkEsryg98BujhVOncKm/C1xROxZ030LQ==",
               "dev": true
             }
           }
@@ -1693,7 +1719,9 @@
           "dev": true
         },
         "minimist": {
-          "version": "^0.2.1"
+          "version": "0.2.4",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.4.tgz",
+          "integrity": "sha512-Pkrrm8NjyQ8yVt8Am9M+yUt74zE3iokhzbG1bFVNjLB92vwM71hf40RkEsryg98BujhVOncKm/C1xROxZ030LQ=="
         },
         "mkdirp": {
           "version": "0.5.5",
@@ -1701,11 +1729,13 @@
           "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
           "dev": true,
           "requires": {
-            "minimist": "^0.2.1"
+            "minimist": "^1.2.5"
           },
           "dependencies": {
             "minimist": {
-              "version": "^0.2.1",
+              "version": "0.2.4",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.4.tgz",
+              "integrity": "sha512-Pkrrm8NjyQ8yVt8Am9M+yUt74zE3iokhzbG1bFVNjLB92vwM71hf40RkEsryg98BujhVOncKm/C1xROxZ030LQ==",
               "dev": true
             }
           }
@@ -1835,11 +1865,13 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.3"
+            "kind-of": "^6.0.0"
           },
           "dependencies": {
             "kind-of": {
-              "version": "^6.0.3",
+              "version": "6.0.3",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
               "dev": true
             }
           }
@@ -1850,11 +1882,13 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.3"
+            "kind-of": "^6.0.0"
           },
           "dependencies": {
             "kind-of": {
-              "version": "^6.0.3",
+              "version": "6.0.3",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
               "dev": true
             }
           }
@@ -1867,11 +1901,13 @@
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.3"
+            "kind-of": "^6.0.2"
           },
           "dependencies": {
             "kind-of": {
-              "version": "^6.0.3",
+              "version": "6.0.3",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
               "dev": true
             }
           }
@@ -1883,7 +1919,9 @@
           "dev": true
         },
         "kind-of": {
-          "version": "^6.0.3"
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
         }
       }
     },
@@ -2561,17 +2599,21 @@
           "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.3"
+            "kind-of": "^3.0.2"
           },
           "dependencies": {
             "kind-of": {
-              "version": "^6.0.3",
+              "version": "6.0.3",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
               "dev": true
             }
           }
         },
         "kind-of": {
-          "version": "^6.0.3"
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
         },
         "normalize-path": {
           "version": "3.0.0",
@@ -2649,18 +2691,22 @@
       },
       "dependencies": {
         "minimist": {
-          "version": "^0.2.1"
+          "version": "0.2.4",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.4.tgz",
+          "integrity": "sha512-Pkrrm8NjyQ8yVt8Am9M+yUt74zE3iokhzbG1bFVNjLB92vwM71hf40RkEsryg98BujhVOncKm/C1xROxZ030LQ=="
         },
         "mkdirp": {
           "version": "0.5.0",
           "resolved": "https://box.jfrog.io/box/api/npm/boxnpm/mkdirp/-/mkdirp-0.5.0.tgz",
           "integrity": "sha1-HXMHam35hs2TROFecfzAWkyavxI=",
           "requires": {
-            "minimist": "^0.2.1"
+            "minimist": "0.0.8"
           },
           "dependencies": {
             "minimist": {
-              "version": "^0.2.1"
+              "version": "0.2.4",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.4.tgz",
+              "integrity": "sha512-Pkrrm8NjyQ8yVt8Am9M+yUt74zE3iokhzbG1bFVNjLB92vwM71hf40RkEsryg98BujhVOncKm/C1xROxZ030LQ=="
             }
           }
         }
@@ -2707,7 +2753,7 @@
       "requires": {
         "for-own": "^1.0.0",
         "is-plain-object": "^2.0.4",
-        "kind-of": "^6.0.3",
+        "kind-of": "^6.0.0",
         "shallow-clone": "^1.0.0"
       },
       "dependencies": {
@@ -2721,7 +2767,9 @@
           }
         },
         "kind-of": {
-          "version": "^6.0.3",
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
           "dev": true
         }
       }
@@ -2870,13 +2918,16 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "ini": "^1.3.8",
+        "ini": "^1.3.4",
         "proto-list": "~1.2.1"
       },
       "dependencies": {
         "ini": {
-          "version": "^1.3.8",
-          "dev": true
+          "version": "1.3.8",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+          "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -3425,11 +3476,13 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.3"
+            "kind-of": "^6.0.0"
           },
           "dependencies": {
             "kind-of": {
-              "version": "^6.0.3",
+              "version": "6.0.3",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
               "dev": true
             }
           }
@@ -3440,11 +3493,13 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.3"
+            "kind-of": "^6.0.0"
           },
           "dependencies": {
             "kind-of": {
-              "version": "^6.0.3",
+              "version": "6.0.3",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
               "dev": true
             }
           }
@@ -3457,11 +3512,13 @@
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.3"
+            "kind-of": "^6.0.2"
           },
           "dependencies": {
             "kind-of": {
-              "version": "^6.0.3",
+              "version": "6.0.3",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
               "dev": true
             }
           }
@@ -3473,7 +3530,9 @@
           "dev": true
         },
         "kind-of": {
-          "version": "^6.0.3"
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
         }
       }
     },
@@ -4358,7 +4417,9 @@
           "optional": true
         },
         "ini": {
-          "version": "^1.3.8"
+          "version": "1.3.8",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+          "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
         },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
@@ -4385,7 +4446,9 @@
           }
         },
         "minimist": {
-          "version": "^0.2.1"
+          "version": "0.2.4",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.4.tgz",
+          "integrity": "sha512-Pkrrm8NjyQ8yVt8Am9M+yUt74zE3iokhzbG1bFVNjLB92vwM71hf40RkEsryg98BujhVOncKm/C1xROxZ030LQ=="
         },
         "minipass": {
           "version": "2.9.0",
@@ -4412,12 +4475,15 @@
           "dev": true,
           "optional": true,
           "requires": {
-            "minimist": "^0.2.1"
+            "minimist": "^1.2.5"
           },
           "dependencies": {
             "minimist": {
-              "version": "^0.2.1",
-              "dev": true
+              "version": "0.2.4",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.4.tgz",
+              "integrity": "sha512-Pkrrm8NjyQ8yVt8Am9M+yUt74zE3iokhzbG1bFVNjLB92vwM71hf40RkEsryg98BujhVOncKm/C1xROxZ030LQ==",
+              "dev": true,
+              "optional": true
             }
           }
         },
@@ -4566,18 +4632,24 @@
           "optional": true,
           "requires": {
             "deep-extend": "^0.6.0",
-            "ini": "^1.3.8",
-            "minimist": "^0.2.1",
+            "ini": "~1.3.0",
+            "minimist": "^1.2.0",
             "strip-json-comments": "~2.0.1"
           },
           "dependencies": {
             "ini": {
-              "version": "^1.3.8",
-              "dev": true
+              "version": "1.3.8",
+              "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+              "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+              "dev": true,
+              "optional": true
             },
             "minimist": {
-              "version": "^0.2.1",
-              "dev": true
+              "version": "0.2.4",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.4.tgz",
+              "integrity": "sha512-Pkrrm8NjyQ8yVt8Am9M+yUt74zE3iokhzbG1bFVNjLB92vwM71hf40RkEsryg98BujhVOncKm/C1xROxZ030LQ==",
+              "dev": true,
+              "optional": true
             }
           }
         },
@@ -5082,7 +5154,7 @@
       "dev": true,
       "requires": {
         "is-number": "^3.0.0",
-        "kind-of": "^6.0.3"
+        "kind-of": "^4.0.0"
       },
       "dependencies": {
         "is-number": {
@@ -5091,17 +5163,21 @@
           "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.3"
+            "kind-of": "^3.0.2"
           },
           "dependencies": {
             "kind-of": {
-              "version": "^6.0.3",
+              "version": "6.0.3",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
               "dev": true
             }
           }
         },
         "kind-of": {
-          "version": "^6.0.3",
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
           "dev": true
         }
       }
@@ -5661,11 +5737,13 @@
       "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
       "dev": true,
       "requires": {
-        "kind-of": "^6.0.3"
+        "kind-of": "^3.0.2"
       },
       "dependencies": {
         "kind-of": {
-          "version": "^6.0.3",
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
           "dev": true
         }
       }
@@ -5722,11 +5800,13 @@
       "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
       "dev": true,
       "requires": {
-        "kind-of": "^6.0.3"
+        "kind-of": "^3.0.2"
       },
       "dependencies": {
         "kind-of": {
-          "version": "^6.0.3",
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
           "dev": true
         }
       }
@@ -5746,11 +5826,13 @@
       "requires": {
         "is-accessor-descriptor": "^0.1.6",
         "is-data-descriptor": "^0.1.4",
-        "kind-of": "^6.0.3"
+        "kind-of": "^5.0.0"
       },
       "dependencies": {
         "kind-of": {
-          "version": "^6.0.3",
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
           "dev": true
         }
       }
@@ -5960,12 +6042,14 @@
       "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
       "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
       "requires": {
-        "node-fetch": "^2.6.1",
+        "node-fetch": "^1.0.1",
         "whatwg-fetch": ">=0.10.0"
       },
       "dependencies": {
         "node-fetch": {
-          "version": "^2.6.1",
+          "version": "2.7.0",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+          "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
           "requires": {
             "whatwg-url": "^5.0.0"
           }
@@ -6108,7 +6192,9 @@
       }
     },
     "kind-of": {
-      "version": "^6.0.3",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true
     },
     "lazy-cache": {
@@ -6170,17 +6256,21 @@
           "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
           "dev": true,
           "requires": {
-            "minimist": "^0.2.1"
+            "minimist": "^1.2.0"
           },
           "dependencies": {
             "minimist": {
-              "version": "^0.2.1",
+              "version": "0.2.4",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.4.tgz",
+              "integrity": "sha512-Pkrrm8NjyQ8yVt8Am9M+yUt74zE3iokhzbG1bFVNjLB92vwM71hf40RkEsryg98BujhVOncKm/C1xROxZ030LQ==",
               "dev": true
             }
           }
         },
         "minimist": {
-          "version": "^0.2.1"
+          "version": "0.2.4",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.4.tgz",
+          "integrity": "sha512-Pkrrm8NjyQ8yVt8Am9M+yUt74zE3iokhzbG1bFVNjLB92vwM71hf40RkEsryg98BujhVOncKm/C1xROxZ030LQ=="
         }
       }
     },
@@ -6380,7 +6470,7 @@
         "decamelize": "^1.1.2",
         "loud-rejection": "^1.0.0",
         "map-obj": "^1.0.1",
-        "minimist": "^0.2.1",
+        "minimist": "^1.1.3",
         "normalize-package-data": "^2.3.4",
         "object-assign": "^4.0.1",
         "read-pkg-up": "^1.0.1",
@@ -6389,7 +6479,9 @@
       },
       "dependencies": {
         "minimist": {
-          "version": "^0.2.1",
+          "version": "0.2.4",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.4.tgz",
+          "integrity": "sha512-Pkrrm8NjyQ8yVt8Am9M+yUt74zE3iokhzbG1bFVNjLB92vwM71hf40RkEsryg98BujhVOncKm/C1xROxZ030LQ==",
           "dev": true
         }
       }
@@ -6467,7 +6559,9 @@
       }
     },
     "minimist": {
-      "version": "^0.2.1",
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.4.tgz",
+      "integrity": "sha512-Pkrrm8NjyQ8yVt8Am9M+yUt74zE3iokhzbG1bFVNjLB92vwM71hf40RkEsryg98BujhVOncKm/C1xROxZ030LQ==",
       "dev": true
     },
     "mixin-deep": {
@@ -6515,11 +6609,13 @@
       "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
       "dev": true,
       "requires": {
-        "minimist": "^0.2.1"
+        "minimist": "^1.2.5"
       },
       "dependencies": {
         "minimist": {
-          "version": "^0.2.1",
+          "version": "0.2.4",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.4.tgz",
+          "integrity": "sha512-Pkrrm8NjyQ8yVt8Am9M+yUt74zE3iokhzbG1bFVNjLB92vwM71hf40RkEsryg98BujhVOncKm/C1xROxZ030LQ==",
           "dev": true
         }
       }
@@ -6565,7 +6661,7 @@
         "extend-shallow": "^3.0.2",
         "fragment-cache": "^0.2.1",
         "is-windows": "^1.0.2",
-        "kind-of": "^6.0.3",
+        "kind-of": "^6.0.2",
         "object.pick": "^1.3.0",
         "regex-not": "^1.0.0",
         "snapdragon": "^0.8.1",
@@ -6604,7 +6700,9 @@
           }
         },
         "kind-of": {
-          "version": "^6.0.3",
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
           "dev": true
         }
       }
@@ -7022,7 +7120,7 @@
       "requires": {
         "copy-descriptor": "^0.1.0",
         "define-property": "^0.2.5",
-        "kind-of": "^6.0.3"
+        "kind-of": "^3.0.3"
       },
       "dependencies": {
         "define-property": {
@@ -7035,7 +7133,9 @@
           }
         },
         "kind-of": {
-          "version": "^6.0.3",
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
           "dev": true
         }
       }
@@ -8072,11 +8172,13 @@
               "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
               "dev": true,
               "requires": {
-                "kind-of": "^6.0.3"
+                "kind-of": "^3.0.2"
               },
               "dependencies": {
                 "kind-of": {
-                  "version": "^6.0.3",
+                  "version": "6.0.3",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+                  "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
                   "dev": true
                 }
               }
@@ -8087,11 +8189,13 @@
               "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
               "dev": true,
               "requires": {
-                "kind-of": "^6.0.3"
+                "kind-of": "^3.0.2"
               },
               "dependencies": {
                 "kind-of": {
-                  "version": "^6.0.3",
+                  "version": "6.0.3",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+                  "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
                   "dev": true
                 }
               }
@@ -8104,17 +8208,21 @@
               "requires": {
                 "is-accessor-descriptor": "^0.1.6",
                 "is-data-descriptor": "^0.1.4",
-                "kind-of": "^6.0.3"
+                "kind-of": "^5.0.0"
               },
               "dependencies": {
                 "kind-of": {
-                  "version": "^6.0.3",
+                  "version": "6.0.3",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+                  "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
                   "dev": true
                 }
               }
             },
             "kind-of": {
-              "version": "^6.0.3"
+              "version": "6.0.3",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
             }
           }
         },
@@ -8204,11 +8312,13 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.3"
+            "kind-of": "^6.0.0"
           },
           "dependencies": {
             "kind-of": {
-              "version": "^6.0.3",
+              "version": "6.0.3",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
               "dev": true
             }
           }
@@ -8219,11 +8329,13 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.3"
+            "kind-of": "^6.0.0"
           },
           "dependencies": {
             "kind-of": {
-              "version": "^6.0.3",
+              "version": "6.0.3",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
               "dev": true
             }
           }
@@ -8236,11 +8348,13 @@
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.3"
+            "kind-of": "^6.0.2"
           },
           "dependencies": {
             "kind-of": {
-              "version": "^6.0.3",
+              "version": "6.0.3",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
               "dev": true
             }
           }
@@ -8251,11 +8365,13 @@
           "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.3"
+            "kind-of": "^3.0.2"
           },
           "dependencies": {
             "kind-of": {
-              "version": "^6.0.3",
+              "version": "6.0.3",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
               "dev": true
             }
           }
@@ -8267,7 +8383,9 @@
           "dev": true
         },
         "kind-of": {
-          "version": "^6.0.3"
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
         },
         "micromatch": {
           "version": "3.1.10",
@@ -8282,7 +8400,7 @@
             "extend-shallow": "^3.0.2",
             "extglob": "^2.0.4",
             "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.3",
+            "kind-of": "^6.0.2",
             "nanomatch": "^1.2.9",
             "object.pick": "^1.3.0",
             "regex-not": "^1.0.0",
@@ -8291,7 +8409,9 @@
           },
           "dependencies": {
             "kind-of": {
-              "version": "^6.0.3",
+              "version": "6.0.3",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
               "dev": true
             }
           }
@@ -8796,12 +8916,14 @@
       "dev": true,
       "requires": {
         "is-extendable": "^0.1.1",
-        "kind-of": "^6.0.3",
+        "kind-of": "^5.0.0",
         "mixin-object": "^2.0.1"
       },
       "dependencies": {
         "kind-of": {
-          "version": "^6.0.3",
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
           "dev": true
         }
       }
@@ -8888,11 +9010,13 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.3"
+            "kind-of": "^6.0.0"
           },
           "dependencies": {
             "kind-of": {
-              "version": "^6.0.3",
+              "version": "6.0.3",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
               "dev": true
             }
           }
@@ -8903,11 +9027,13 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.3"
+            "kind-of": "^6.0.0"
           },
           "dependencies": {
             "kind-of": {
-              "version": "^6.0.3",
+              "version": "6.0.3",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
               "dev": true
             }
           }
@@ -8920,11 +9046,13 @@
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.3"
+            "kind-of": "^6.0.2"
           },
           "dependencies": {
             "kind-of": {
-              "version": "^6.0.3",
+              "version": "6.0.3",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
               "dev": true
             }
           }
@@ -8936,7 +9064,9 @@
           "dev": true
         },
         "kind-of": {
-          "version": "^6.0.3"
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
         }
       }
     },
@@ -8946,11 +9076,13 @@
       "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "dev": true,
       "requires": {
-        "kind-of": "^6.0.3"
+        "kind-of": "^3.2.0"
       },
       "dependencies": {
         "kind-of": {
-          "version": "^6.0.3",
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
           "dev": true
         }
       }
@@ -9593,11 +9725,13 @@
       "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
       "dev": true,
       "requires": {
-        "kind-of": "^6.0.3"
+        "kind-of": "^3.0.2"
       },
       "dependencies": {
         "kind-of": {
-          "version": "^6.0.3",
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
           "dev": true
         }
       }
@@ -9651,17 +9785,21 @@
           "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
           "dev": true,
           "requires": {
-            "kind-of": "^6.0.3"
+            "kind-of": "^3.0.2"
           },
           "dependencies": {
             "kind-of": {
-              "version": "^6.0.3",
+              "version": "6.0.3",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
               "dev": true
             }
           }
         },
         "kind-of": {
-          "version": "^6.0.3"
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
         }
       }
     },
@@ -10173,7 +10311,7 @@
             "string-width": "^1.0.2",
             "which-module": "^1.0.0",
             "y18n": "^3.2.1",
-            "yargs-parser": "18.1.2"
+            "yargs-parser": "^4.2.0"
           },
           "dependencies": {
             "yargs-parser": {
@@ -10325,7 +10463,7 @@
         "string-width": "^1.0.2",
         "which-module": "^1.0.0",
         "y18n": "^3.2.1",
-        "yargs-parser": "18.1.2"
+        "yargs-parser": "^5.0.0"
       },
       "dependencies": {
         "camelcase": {
@@ -10366,4 +10504,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/webapp/src/main/java/com/box/l10n/mojito/service/thirdparty/ThirdPartyTMSPhrase.java b/webapp/src/main/java/com/box/l10n/mojito/service/thirdparty/ThirdPartyTMSPhrase.java
index ba278cf1b5..3128c26657 100644
--- a/webapp/src/main/java/com/box/l10n/mojito/service/thirdparty/ThirdPartyTMSPhrase.java
+++ b/webapp/src/main/java/com/box/l10n/mojito/service/thirdparty/ThirdPartyTMSPhrase.java
@@ -22,6 +22,8 @@
 import com.google.common.collect.ImmutableList;
 import com.phrase.client.model.Tag;
 import com.phrase.client.model.TranslationKey;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Timer;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.AbstractMap.SimpleEntry;
@@ -34,6 +36,7 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -50,19 +53,28 @@ public class ThirdPartyTMSPhrase implements ThirdPartyTMS {
 
   static Logger logger = LoggerFactory.getLogger(ThirdPartyTMSPhrase.class);
 
-  @Autowired TextUnitSearcher textUnitSearcher = new TextUnitSearcher();
+  TextUnitSearcher textUnitSearcher = new TextUnitSearcher();
 
-  @Autowired TextUnitBatchImporterService textUnitBatchImporterService;
+  TextUnitBatchImporterService textUnitBatchImporterService;
 
-  @Autowired(required = false)
   PhraseClient phraseClient;
 
-  @Autowired RepositoryService repositoryService;
+  RepositoryService repositoryService;
 
-  public ThirdPartyTMSPhrase() {}
+  MeterRegistry meterRegistry;
 
-  public ThirdPartyTMSPhrase(PhraseClient phraseClient) {
+  public ThirdPartyTMSPhrase(
+      TextUnitSearcher textUnitSearcher,
+      TextUnitBatchImporterService textUnitBatchImporterService,
+      PhraseClient phraseClient,
+      RepositoryService repositoryService,
+      MeterRegistry meterRegistry) {
+
+    this.textUnitSearcher = textUnitSearcher;
+    this.textUnitBatchImporterService = textUnitBatchImporterService;
     this.phraseClient = phraseClient;
+    this.repositoryService = repositoryService;
+    this.meterRegistry = meterRegistry;
   }
 
   @Override
@@ -281,7 +293,24 @@ public PollableFuture<Void> pull(
 
     String currentTags = getCurrentTagsForRepository(repository, projectId);
 
-    for (RepositoryLocale repositoryLocale : repositoryLocalesWithoutRootLocale) {
+    repositoryLocalesWithoutRootLocale.parallelStream()
+        .forEach(pullLocaleTimed(repository, projectId, pluralSeparator, currentTags));
+    return null;
+  }
+
+  private Consumer<RepositoryLocale> pullLocaleTimed(
+      Repository repository, String projectId, String pluralSeparator, String currentTags) {
+    try (var timer =
+        Timer.resource(meterRegistry, "ThirdPartyTMSPhrase.pullLocale")
+            .tag("repository", repository.getName())) {
+
+      return pullLocale(repository, projectId, pluralSeparator, currentTags);
+    }
+  }
+
+  private Consumer<RepositoryLocale> pullLocale(
+      Repository repository, String projectId, String pluralSeparator, String currentTags) {
+    return repositoryLocale -> {
       String localeTag = repositoryLocale.getLocale().getBcp47Tag();
       logger.info("Downloading locale: {} from Phrase with tags: {}", localeTag, currentTags);
 
@@ -293,7 +322,7 @@ public PollableFuture<Void> pull(
               currentTags,
               () -> getCurrentTagsForRepository(repository, projectId));
 
-      logger.info("file content from pull: {}", fileContent);
+      logger.debug("file content from pull: {}", fileContent);
 
       AndroidStringDocumentMapper mapper =
           new AndroidStringDocumentMapper(
@@ -308,9 +337,7 @@ public PollableFuture<Void> pull(
       textUnitDTOS.forEach(t -> t.setComment(null));
 
       textUnitBatchImporterService.importTextUnits(textUnitDTOS, false, true);
-    }
-
-    return null;
+    };
   }
 
   /**