Merge branch 'upstream/alpha' into moumouls/update-graphql

# Conflicts:
#	package-lock.json
#	package.json

Author: Moumouls

package-lock.json

@@ -30,7 +30,7 @@
     "cors": "2.8.5",
     "deepcopy": "2.1.0",
     "express": "4.17.2",
-    "follow-redirects": "1.14.8",
+    "follow-redirects": "1.14.9",
     "graphql": "15.8.0",
     "graphql-list-fields": "2.0.2",
     "graphql-relay": "0.7.0",