Merge branch 'main' into terminology-rieks

# Conflicts:
#	docusaurus.config.js
1 job for terminology-rieks in 1 minute and 52 seconds (queued for 5 seconds)