Merge branch 'main' into feature/LlamaIndex

# Conflicts:
#	.github/workflows/autoSyncMergedPullRequest.yml