Merge remote-tracking branch 'origin/develop' into master-conflicts

# Conflicts:
#	CHANGELOG.md
#	README
#	VERSION.txt
#	collection_manager/requirements.txt
#	granule_ingester/pyproject.toml