merge main

Merge branch 'main' into develop

# Conflicts:
#	DESCRIPTION
#	NEWS.md
#	docs/404.html
#	docs/articles/CreatingCovariatesBasedOnOtherCohorts.html
#	docs/articles/CreatingCovariatesUsingCohortAttributes.html
#	docs/articles/CreatingCustomCovariateBuilders.html
#	docs/articles/CreatingCustomCovariateBuildersKorean.html
#	docs/articles/UsingFeatureExtraction.html
#	docs/articles/UsingFeatureExtractionKorean.html
#	docs/articles/index.html
#	docs/authors.html
#	docs/index.html
#	docs/news/index.html
#	docs/pkgdown.yml
#	docs/reference/CovariateData-class.html
#	docs/reference/FeatureExtraction-package.html
#	docs/reference/aggregateCovariates.html
#	docs/reference/computeStandardizedDifference.html
#	docs/reference/convertPrespecSettingsToDetailedSettings.html
#	docs/reference/createAnalysisDetails.html
#	docs/reference/createCohortAttrCovariateSettings.html
#	docs/reference/createCohortBasedCovariateSettings.html
#	docs/reference/createCohortBasedTemporalCovariateSettings.html
#	docs/reference/createCovariateSettings.html
#	docs/reference/createDefaultCovariateSettings.html
#	docs/reference/createDefaultTemporalCovariateSettings.html
#	docs/reference/createDetailedCovariateSettings.html
#	docs/reference/createDetailedTemporalCovariateSettings.html
#	docs/reference/createEmptyCovariateData.html
#	docs/reference/createTable1.html
#	docs/reference/createTable1CovariateSettings.html
#	docs/reference/createTemporalCovariateSettings.html
#	docs/reference/createTemporalSequenceCovariateSettings.html
#	docs/reference/dot-createLooCovariateSettings.html
#	docs/reference/dot-getDbLooCovariateData.html
#	docs/reference/filterByCohortDefinitionId.html
#	docs/reference/filterByRowId.html
#	docs/reference/getDbCohortAttrCovariatesData.html
#	docs/reference/getDbCohortBasedCovariatesData.html
#	docs/reference/getDbCovariateData.html
#	docs/reference/getDbDefaultCovariateData.html
#	docs/reference/getDefaultTable1Specifications.html
#	docs/reference/index.html
#	docs/reference/isAggregatedCovariateData.html
#	docs/reference/isCovariateData.html
#	docs/reference/isTemporalCovariateData.html
#	docs/reference/loadCovariateData.html
#	docs/reference/replaceCovariateSettingsCohortSchemaTable.html
#	docs/reference/saveCovariateData.html
#	docs/reference/tidyCovariateData.html
#	extras/FeatureExtraction.pdf
#	inst/doc/CreatingCovariatesBasedOnOtherCohorts.pdf
#	inst/doc/CreatingCovariatesUsingCohortAttributes.pdf
#	inst/doc/CreatingCustomCovariateBuilders.pdf
#	inst/doc/CreatingCustomCovariateBuildersKorean.pdf
#	inst/doc/UsingFeatureExtraction.pdf
#	inst/doc/UsingFeatureExtractionKorean.pdf
#	inst/java/featureExtraction-3.10.0.jar
#	inst/java/featureExtraction-3.11.0.jar
#	inst/java/featureExtraction-3.12.0.jar

Author: ginberg