Merge branch 'master' into stage-challenge

# Conflicts:
#	Pipfile.lock

web/package-lock.json

@@ -255,9 +255,9 @@
             }
         },
         "@types/chart.js": {
-            "version": "2.9.30",
-            "resolved": "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.9.30.tgz",
-            "integrity": "sha512-EgjxUUZFvf6ls3kW2CwyrnSJhgyKxgwrlp/W5G9wqyPEO9iFatO63zAA7L24YqgMxiDjQ+tG7ODU+2yWH91lPg==",
+            "version": "2.9.31",
+            "resolved": "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.9.31.tgz",
+            "integrity": "sha512-hzS6phN/kx3jClk3iYqEHNnYIRSi4RZrIGJ8CDLjgatpHoftCezvC44uqB3o3OUm9ftU1m7sHG8+RLyPTlACrA==",
             "requires": {
                 "moment": "^2.10.2"
             }

web/package.json

@@ -14,7 +14,7 @@
         "@patternfly/patternfly": "^4.87.3",
         "@sentry/browser": "^6.2.0",
         "@sentry/tracing": "^6.2.0",
-        "@types/chart.js": "^2.9.30",
+        "@types/chart.js": "^2.9.31",
         "@types/codemirror": "0.0.108",
         "@types/grecaptcha": "^3.0.1",
         "base64-js": "^1.5.1",