Merge branch 'master' into develop

# Conflicts:
#	.env
#	.github/workflows/ci.yml
#	.vscode/launch.json
#	package.json
#	src/api/init.ts
#	src/datastore/common.ts
#	src/datastore/pg-store.ts
#	src/event-stream/event-server.ts
#	src/event-stream/reader.ts
#	src/index.ts
#	src/test-utils/test-helpers.ts
#	src/tests-2.4/pox-3-delegate-aggregation.ts
#	src/tests-bns-e2e/bns-integration-tests.ts
#	src/tests-bns/v1-import-tests.ts
#	src/tests-tokens-metadata/tokens-metadata-tests.ts

docs/api/info/get-status.schema.json

@@ -19,6 +19,10 @@
       "type": "integer",
       "nullable": true
     },
+    "pox_v2_unlock_height": {
+      "type": "integer",
+      "nullable": true
+    },
     "chain_tip": {
       "$ref": "../../entities/info/chain-tip.schema.json"
     }