feat: merge upstream changes

[richardapeters]

No description provided.

[github-actions]

🦙 MegaLinter status: ✅ SUCCESS

Descriptor	Linter	Files	Fixed	Errors	Elapsed time
✅ ACTION	actionlint	5		0	0.02s
✅ MARKDOWN	markdownlint	5	0	0	0.85s
✅ MARKDOWN	markdown-link-check	5		0	5.06s
✅ MARKDOWN	markdown-table-formatter	5	0	0	0.66s
✅ REPOSITORY	checkov	yes		no	16.06s
✅ REPOSITORY	dustilock	yes		no	0.02s
✅ REPOSITORY	gitleaks	yes		no	54.66s
✅ REPOSITORY	git_diff	yes		no	0.42s
✅ REPOSITORY	secretlint	yes		no	14.0s
✅ REPOSITORY	syft	yes		no	2.54s
✅ REPOSITORY	trivy	yes		no	3.88s
✅ SPELL	misspell	28	1	0	0.53s
✅ XML	xmllint	16	1	0	0.49s
✅ YAML	prettier	7	1	0	1.02s
✅ YAML	v8r	7		0	7.19s
✅ YAML	yamllint	7		0	0.37s

See detailed report in MegaLinter reports

MegaLinter is graciously provided by