Merge branch 'master' into dependabot/npm_and_yarn/react-17.0.2

Author: mpeyper

package.json

@@ -63,7 +63,7 @@
     "prettier": "^2.2.1",
     "react": "17.0.2",
     "react-dom": "^17.0.1",
-    "react-test-renderer": "17.0.1",
+    "react-test-renderer": "17.0.2",
     "ts-node": "^9.1.1",
     "typescript": "4.2.3"
   },