Merge branch 'main' into dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-8.47.0

Author: anthony-nhs