From e388000f2b0a7a1aa4adb89b5fb6bb87e5155a37 Mon Sep 17 00:00:00 2001
From: alaskowski <alaskowski@ethz.ch>
Date: Thu, 16 Feb 2023 15:52:05 +0100
Subject: [PATCH] SSDM-13365: Updated copyright comments in
 server-original-data-store

---
 .../source/java/ch/ethz/sis/DOCXBuilder.java      | 15 +++++++++++++++
 .../plugins/DataSetRegistrationCleanUpTask.java   |  3 +--
 .../plugins/PreStagingCleanUpMaintenanceTask.java |  2 +-
 .../SessionWorkspaceCleanUpMaintenanceTask.java   |  3 +--
 .../dss/plugins/sync/common/EntityRetriever.java  |  2 +-
 .../plugins/sync/common/MasterDataExtractor.java  |  3 +--
 .../plugins/sync/common/ServiceFinderUtils.java   |  3 +--
 .../sync/common/SkinnyEntityRetriever.java        |  2 +-
 .../dss/plugins/sync/common/SyncEntityKind.java   |  3 +--
 .../dss/plugins/sync/common/entitygraph/Edge.java |  2 +-
 .../sync/common/entitygraph/EdgeNodePair.java     |  2 +-
 .../sync/common/entitygraph/EntityGraph.java      |  2 +-
 .../sync/common/entitygraph/IEntityRetriever.java |  3 +--
 .../plugins/sync/common/entitygraph/INode.java    |  3 +--
 .../dss/plugins/sync/common/entitygraph/Node.java |  2 +-
 .../sync/common/entitygraph/NodeIdentifier.java   |  3 +--
 .../sync/common/entitygraph/SkinnyNode.java       |  3 +--
 .../sync/datasource/AbstractEntityDeliverer.java  |  3 +--
 .../AbstractEntityWithPermIdDeliverer.java        |  3 +--
 .../sync/datasource/ConnectionsBuilder.java       |  3 +--
 .../plugins/sync/datasource/DataSetDeliverer.java |  3 +--
 .../sync/datasource/DataSourceRequestHandler.java |  3 +--
 .../plugins/sync/datasource/DataSourceUtils.java  |  3 +--
 .../dss/plugins/sync/datasource/Deliverers.java   |  3 +--
 .../plugins/sync/datasource/DeliveryContext.java  |  3 +--
 .../sync/datasource/DeliveryExecutionContext.java |  3 +--
 .../sync/datasource/ExperimentDeliverer.java      |  3 +--
 .../plugins/sync/datasource/FileDeliverer.java    |  3 +--
 .../dss/plugins/sync/datasource/IDeliverer.java   |  3 +--
 .../sync/datasource/MasterDataDeliverer.java      |  3 +--
 .../sync/datasource/MaterialDeliverer.java        |  3 +--
 .../plugins/sync/datasource/ProjectDeliverer.java |  3 +--
 .../datasource/ResourceSyncRequestHandler.java    |  2 +-
 .../plugins/sync/datasource/SampleDeliverer.java  |  3 +--
 .../plugins/sync/datasource/SpaceDeliverer.java   |  3 +--
 .../sync/harvester/HarvesterMaintenanceTask.java  |  2 +-
 .../harvester/config/BasicAuthCredentials.java    |  3 +--
 .../sync/harvester/config/ConfigReader.java       |  3 +--
 .../config/ParallelizedExecutionPreferences.java  |  3 +--
 .../plugins/sync/harvester/config/SyncConfig.java |  3 +--
 .../config/SynchronizationConfigReader.java       |  3 +--
 .../AbstractTimestampsAndUserHolder.java          |  3 +--
 .../sync/harvester/synchronizer/Connection.java   |  3 +--
 .../harvester/synchronizer/ConnectionType.java    |  3 +--
 .../synchronizer/EntitySynchronizer.java          |  3 +--
 .../sync/harvester/synchronizer/FrozenFlags.java  |  3 +--
 .../harvester/synchronizer/FrozenForType.java     |  3 +--
 .../harvester/synchronizer/IHarvesterQuery.java   |  3 +--
 .../synchronizer/ISynchronizerFacade.java         |  4 ++--
 .../harvester/synchronizer/IncomingDataSet.java   |  3 +--
 .../harvester/synchronizer/IncomingEntity.java    |  3 +--
 .../synchronizer/IncomingExperiment.java          |  3 +--
 .../harvester/synchronizer/IncomingMaterial.java  |  3 +--
 .../harvester/synchronizer/IncomingProject.java   |  3 +--
 .../harvester/synchronizer/IncomingSample.java    |  3 +--
 .../harvester/synchronizer/IncomingSpace.java     |  3 +--
 .../sync/harvester/synchronizer/MasterData.java   |  3 +--
 .../harvester/synchronizer/MasterDataParser.java  |  3 +--
 .../synchronizer/MasterDataSynchronizer.java      |  3 +--
 .../synchronizer/MaterialTypeRecord.java          |  3 +--
 .../sync/harvester/synchronizer/NameMapper.java   |  3 +--
 .../sync/harvester/synchronizer/PersonRecord.java |  3 +--
 .../harvester/synchronizer/RegistrationDTO.java   |  3 +--
 .../synchronizer/ResourceListParser.java          |  2 +-
 .../synchronizer/ResourceListParserData.java      |  2 +-
 .../synchronizer/SynchronizationContext.java      | 11 +++++------
 .../synchronizer/SynchronizerFacade.java          |  3 ++-
 .../datasourceconnector/DataSourceConnector.java  |  3 +--
 .../datasourceconnector/IDataSourceConnector.java |  3 +--
 .../AttachmentSynchronizationSummary.java         |  3 +--
 .../AttachmentsSynchronizer.java                  |  3 +--
 .../DataSetRegistrationIngestionService.java      |  3 +--
 .../DataSetRegistrationTaskExecutor.java          |  3 +--
 .../DataSetSynchronizationSummary.java            |  3 +--
 .../translator/DefaultNameTranslator.java         |  3 +--
 .../synchronizer/translator/INameTranslator.java  |  3 +--
 .../translator/PrefixBasedNameTranslator.java     |  3 +--
 .../synchronizer/util/DSPropertyUtils.java        |  3 +--
 .../sync/harvester/synchronizer/util/Monitor.java |  3 +--
 .../harvester/synchronizer/util/ServiceUtils.java |  3 +--
 .../harvester/synchronizer/util/SummaryUtils.java |  3 +--
 .../harvester/synchronizer/util/V3Facade.java     |  3 +--
 .../generic/server/dssapi/v3/Constants.java       |  3 +--
 .../server/dssapi/v3/DataStoreServerApi.java      |  2 +-
 .../server/dssapi/v3/DataStoreServerApiJson.java  |  3 +--
 .../dssapi/v3/DataStoreServerApiJsonServer.java   |  3 +--
 .../dssapi/v3/DataStoreServerApiLogger.java       | 15 +++++++++++++++
 ...erApiPersonalAccessTokenInvocationHandler.java | 15 +++++++++++++++
 .../dssapi/v3/DataStoreServerApiServer.java       |  3 +--
 .../dssapi/v3/FileTransferServerServlet.java      |  3 +--
 .../dssapi/v3/Log4jBaseFileTransferLogger.java    |  3 +--
 .../openbis/generic/server/dssapi/v3/Utils.java   |  3 +--
 .../download/DataSetFileDownloadInputStream.java  |  3 +--
 .../executor/CreateUploadedDataSetExecutor.java   |  3 +--
 .../executor/ICreateUploadedDataSetExecutor.java  |  3 +--
 .../dssapi/v3/pathinfo/DataSetContentNode.java    | 15 +++++++++++++++
 .../server/dssapi/v3/pathinfo/DirectoryNode.java  | 15 +++++++++++++++
 .../server/dssapi/v3/pathinfo/FileNode.java       | 15 +++++++++++++++
 .../server/dssapi/v3/pathinfo/PathInfoFeeder.java |  2 +-
 .../v3/upload/StoreShareFileUploadServlet.java    |  3 +--
 .../etlserver/AbstractDataSetInfoExtractor.java   |  3 +--
 .../AbstractDelegatingDataSetInfoExtractor.java   |  3 +--
 .../AbstractDelegatingStorageProcessor.java       |  3 +--
 ...ractDelegatingStorageProcessorTransaction.java |  3 +--
 ...egistrationDataSetHandlerForFileBasedUndo.java |  3 +--
 .../cisd/etlserver/AbstractStorageProcessor.java  |  3 +--
 .../AbstractStorageProcessorTransaction.java      |  3 +--
 .../AbstractStrorageProcessorWithUploader.java    |  3 +--
 .../AbstractTopLevelDataSetRegistrator.java       |  3 +--
 .../cisd/etlserver/BaseDirectoryHolder.java       |  3 +--
 .../systemsx/cisd/etlserver/ChannelSetHelper.java |  3 +--
 .../cisd/etlserver/CifexStorageProcessor.java     |  3 +--
 .../systemsx/cisd/etlserver/ConfigProvider.java   |  3 +--
 .../ch/systemsx/cisd/etlserver/Constants.java     |  3 +--
 .../DataSetInfoExtractorWithFileNameProperty.java |  3 +--
 .../etlserver/DataSetInfoFileNameDecorator.java   |  3 +--
 .../etlserver/DataSetNameEntitiesProvider.java    |  3 +--
 .../etlserver/DataSetRegistrationAlgorithm.java   |  3 +--
 .../DataSetRegistrationAlgorithmRunner.java       |  3 +--
 .../cisd/etlserver/DataSetRegistrationHelper.java |  3 +--
 .../etlserver/DataSetRegistrationRollbacker.java  |  3 +--
 .../cisd/etlserver/DataStoreStrategyKey.java      |  3 +--
 .../cisd/etlserver/DataStrategyStore.java         |  3 +--
 .../etlserver/DefaultDataSetInfoExtractor.java    |  3 +--
 .../cisd/etlserver/DefaultStorageProcessor.java   |  3 +--
 .../DelegatingStorageProcessorWithDropbox.java    |  3 +--
 .../etlserver/DispatcherStorageProcessor.java     |  3 +--
 .../DssRegistrationLogDirectoryHelper.java        |  3 +--
 .../cisd/etlserver/DssRegistrationLogger.java     |  3 +--
 .../etlserver/DssUniqueFilenameGenerator.java     |  3 +--
 .../etlserver/DynamicTransactionQueryFactory.java |  3 +--
 .../ch/systemsx/cisd/etlserver/ETLDaemon.java     |  3 +--
 ...verExposablePropertyPlaceholderConfigurer.java | 15 +++++++++++++++
 .../systemsx/cisd/etlserver/ETLServerPlugin.java  |  3 +--
 .../cisd/etlserver/ETLServerPluginFactory.java    |  3 +--
 .../ch/systemsx/cisd/etlserver/FileBasedFile.java |  3 +--
 .../cisd/etlserver/FileBasedFileFactory.java      |  3 +--
 .../ch/systemsx/cisd/etlserver/FileRenamer.java   |  3 +--
 .../cisd/etlserver/FileTypeExtractor.java         |  3 +--
 .../cisd/etlserver/HCSImageCheckList.java         |  3 +--
 .../etlserver/IArchiveCandidateDiscoverer.java    | 15 +++++++++++++++
 .../cisd/etlserver/IAutoArchiverPolicy.java       |  3 +--
 .../systemsx/cisd/etlserver/IDataSetHandler.java  |  3 +--
 .../cisd/etlserver/IDataSetHandlerRpc.java        |  3 +--
 .../etlserver/IDataSetHandlerWithMailClient.java  |  3 +--
 .../cisd/etlserver/IDataSetInfoExtractor.java     |  3 +--
 .../cisd/etlserver/IDataSetPathsInfoFeeder.java   |  3 +--
 .../systemsx/cisd/etlserver/IDataSetUploader.java |  3 +--
 .../cisd/etlserver/IDataStoreStrategy.java        |  3 +--
 .../cisd/etlserver/IDataStrategyStore.java        |  3 +--
 .../systemsx/cisd/etlserver/IETLServerPlugin.java |  3 +--
 .../cisd/etlserver/IExtensibleDataSetHandler.java |  3 +--
 .../java/ch/systemsx/cisd/etlserver/IFile.java    |  3 +--
 .../ch/systemsx/cisd/etlserver/IFileFactory.java  |  3 +--
 .../cisd/etlserver/IFileFormatTypeExtractor.java  |  3 +--
 .../cisd/etlserver/IPostRegistrationAction.java   |  3 +--
 .../cisd/etlserver/IPreRegistrationAction.java    |  3 +--
 .../ch/systemsx/cisd/etlserver/IProcessor.java    |  3 +--
 .../etlserver/IStorageProcessorTransactional.java |  3 +--
 .../cisd/etlserver/IStoreRootDirectoryHolder.java |  3 +--
 .../etlserver/ITopLevelDataSetRegistrator.java    |  3 +--
 .../ITopLevelDataSetRegistratorDelegate.java      |  3 +--
 .../systemsx/cisd/etlserver/ITypeExtractor.java   |  3 +--
 .../cisd/etlserver/IdentifiedDataStrategy.java    |  3 +--
 .../cisd/etlserver/NamedDataStrategy.java         |  3 +--
 .../NullStorageProcessorTransaction.java          |  3 +--
 .../ch/systemsx/cisd/etlserver/Parameters.java    |  3 +--
 .../systemsx/cisd/etlserver/PlateDimension.java   |  3 +--
 .../cisd/etlserver/PlateDimensionParser.java      |  3 +--
 .../etlserver/PropertiesBasedETLServerPlugin.java |  3 +--
 .../cisd/etlserver/SampleRegisteringDropbox.java  |  3 +--
 .../cisd/etlserver/SimpleTypeExtractor.java       |  3 +--
 .../SmartParentDataSetInfoExtractor.java          |  3 +--
 .../cisd/etlserver/StandardProcessor.java         |  3 +--
 .../etlserver/StorageProcessorWithDropbox.java    |  3 +--
 .../systemsx/cisd/etlserver/ThreadParameters.java |  3 +--
 .../TopLevelDataSetRegistratorGlobalState.java    |  3 +--
 .../cisd/etlserver/TransferredDataSetHandler.java |  3 +--
 .../api/v1/DataSetTypeToRegistratorMapper.java    |  3 +--
 .../cisd/etlserver/api/v1/PutDataSetExecutor.java |  3 +--
 .../api/v1/PutDataSetServerPluginHolder.java      |  3 +--
 .../cisd/etlserver/api/v1/PutDataSetService.java  |  3 +--
 .../api/v1/PutDataSetTopLevelDataSetHandler.java  |  3 +--
 .../cisd/etlserver/api/v1/PutDataSetUtil.java     |  3 +--
 .../cifex/CifexDataSetInfoExtractor.java          |  3 +--
 .../etlserver/cifex/CifexExtractorHelper.java     |  3 +--
 .../cisd/etlserver/cifex/CifexTypeExtractor.java  |  3 +--
 .../AbstractSampleAndDataSetProcessor.java        |  3 +--
 .../entityregistration/RegistrationStatus.java    | 15 +++++++++++++++
 .../SampleAndDataSetControlFileProcessor.java     |  3 +--
 .../SampleAndDataSetFolderProcessor.java          |  3 +--
 .../SampleAndDataSetRegistrationGlobalState.java  |  3 +--
 .../SampleAndDataSetRegistrationHandler.java      |  3 +--
 .../SampleAndDataSetRegistrator.java              |  3 +--
 .../entityregistration/SampleDataSetPair.java     |  3 +--
 .../SampleDataSetPairParserObjectFactory.java     |  3 +--
 .../cisd/etlserver/hdf5/HDF5StorageProcessor.java |  3 +--
 .../path/AbstractPathInfoDatabaseFeedingTask.java |  3 +--
 .../DataSetAndPathInfoDBConsistencyCheckTask.java |  3 +--
 .../path/DatabaseBasedDataSetPathsInfoFeeder.java |  3 +--
 .../cisd/etlserver/path/IPathsInfoDAO.java        |  3 +--
 .../cisd/etlserver/path/PathEntryDTO.java         |  3 +--
 .../PathInfoDatabaseChecksumCalculationTask.java  |  3 +--
 .../path/PathInfoDatabaseFeedingTask.java         |  3 +--
 .../path/PathInfoDatabaseRefreshingTask.java      |  3 +--
 .../cisd/etlserver/path/TimeInterval.java         |  3 +--
 ...aSetDeletionPostProcessingMaintenanceTask.java |  2 +-
 ...gMaintenanceTaskWhichHandlesLastSeenEvent.java | 15 +++++++++++++++
 .../AbstractMaintenanceTaskWithStateFile.java     |  3 +--
 .../plugins/AgeArchiveCandidateDiscoverer.java    | 15 +++++++++++++++
 .../cisd/etlserver/plugins/AutoArchiverTask.java  |  3 +--
 .../etlserver/plugins/BaseGroupingPolicy.java     | 15 +++++++++++++++
 .../BlastDatabaseCreationMaintenanceTask.java     |  3 +--
 .../etlserver/plugins/ByExperimentPolicy.java     | 15 +++++++++++++++
 .../cisd/etlserver/plugins/BySpacePolicy.java     | 15 +++++++++++++++
 .../plugins/DataSetArchiverOrphanFinderTask.java  | 15 +++++++++++++++
 .../plugins/DataSetDeletionMaintenanceTask.java   |  3 +--
 .../cisd/etlserver/plugins/DataSetMover.java      | 15 +++++++++++++++
 ...DeletedInApplicationServerMaintenanceTask.java |  3 +--
 .../plugins/DeleteFromArchiveMaintenanceTask.java |  3 +--
 .../DeleteFromExternalDBMaintenanceTask.java      |  2 +-
 .../cisd/etlserver/plugins/DirectoryAction.java   |  3 +--
 .../plugins/DummyAutoArchiverPolicy.java          |  3 +--
 .../plugins/ExperimentBasedArchivingTask.java     |  3 +--
 .../plugins/FastaFileBuilderForDataSetFiles.java  |  3 +--
 .../FileSystemMonitoringMaintenanceTask.java      |  3 +--
 ...eInOpenbisDBFromPathInfoDBMaintenanceTask.java |  3 +--
 .../plugins/GenericFastaFileBuilder.java          |  3 +--
 .../cisd/etlserver/plugins/GroupingPolicy.java    |  3 +--
 .../cisd/etlserver/plugins/HierarchicalPath.java  | 15 +++++++++++++++
 .../plugins/HierarchicalStorageUpdater.java       |  3 +--
 .../cisd/etlserver/plugins/IDataSetMover.java     |  3 +--
 .../IHierarchicalStorageLinkNamingStrategy.java   |  3 +--
 .../plugins/ISegmentedStoreShuffling.java         |  3 +--
 .../cisd/etlserver/plugins/ImportState.java       |  3 +--
 .../etlserver/plugins/ImportStateMarkerFile.java  |  3 +--
 .../etlserver/plugins/MonitoredDirectory.java     |  3 +--
 .../plugins/ResetArchivePendingTask.java          | 15 +++++++++++++++
 .../plugins/SegmentedStoreShufflingTask.java      |  3 +--
 .../cisd/etlserver/plugins/SimpleShuffling.java   |  3 +--
 .../plugins/SimpleShufflingShareFinder.java       |  3 +--
 .../plugins/TagArchiveCandidateDiscoverer.java    | 15 +++++++++++++++
 .../plugins/TemplateBasedLinkNamingStrategy.java  |  3 +--
 .../WriteDirectoryNameToDropboxAction.java        |  3 +--
 .../plugins/grouping/DatasetListWithTotal.java    | 15 +++++++++++++++
 .../cisd/etlserver/plugins/grouping/Grouping.java |  3 +--
 .../plugins/grouping/IGroupKeyProvider.java       | 15 +++++++++++++++
 .../AbstractPostRegistrationTask.java             |  3 +--
 ...ctPostRegistrationTaskForPhysicalDataSets.java |  3 +--
 .../postregistration/ArchivingExecutor.java       |  3 +--
 .../ArchivingPostRegistrationTask.java            |  3 +--
 .../DummyPostRegistrationTaskExecutor.java        |  3 +--
 .../postregistration/EagerShufflingTask.java      |  3 +--
 .../Hdf5CompressingPostRegistrationTask.java      |  3 +--
 .../etlserver/postregistration/ICleanupTask.java  |  3 +--
 .../postregistration/IPostRegistrationTask.java   |  3 +--
 .../IPostRegistrationTaskExecutor.java            |  3 +--
 .../etlserver/postregistration/NoCleanupTask.java |  3 +--
 .../etlserver/postregistration/NotifyingTask.java |  3 +--
 .../PostRegistrationMaintenanceTask.java          |  3 +--
 .../RequestArchivingPostRegistrationTask.java     |  3 +--
 .../SecondCopyPostRegistrationTask.java           |  3 +--
 .../postregistration/SimpleShareFinder.java       |  3 +--
 .../etlserver/postregistration/TaskExecutor.java  |  3 +--
 .../cisd/etlserver/registrator/DataSetFile.java   | 15 +++++++++++++++
 .../registrator/DataSetRegistrationContext.java   | 15 +++++++++++++++
 .../registrator/DataSetRegistrationDetails.java   |  3 +--
 .../DataSetRegistrationPersistentMap.java         | 15 +++++++++++++++
 .../DataSetRegistrationPreStagingBehavior.java    | 15 +++++++++++++++
 .../etlserver/registrator/DefaultDropbox.java     |  3 +--
 .../registrator/DistinctExceptionsCollection.java |  3 +--
 .../registrator/IEntityOperationService.java      |  3 +--
 .../etlserver/registrator/IRollbackStack.java     |  3 +--
 .../registrator/ITransactionalCommand.java        |  3 +--
 ...ingFileDeletedBeforeRegistrationException.java |  3 +--
 .../registrator/JythonTopLevelDataSetHandler.java |  3 +--
 .../etlserver/registrator/MarkerFileUtility.java  |  3 +--
 .../registrator/TopLevelDataSetChecker.java       |  3 +--
 .../api/impl/AbstractTransactionalCommand.java    |  3 +--
 .../registrator/api/impl/MkdirsCommand.java       |  3 +--
 .../registrator/api/impl/MoveFileCommand.java     |  3 +--
 .../registrator/api/impl/NewFileCommand.java      |  3 +--
 .../registrator/api/impl/NewLinkCommand.java      |  3 +--
 .../registrator/api/impl/RollbackStack.java       |  3 +--
 .../api/impl/SecondaryTransactionFailure.java     |  3 +--
 .../etlserver/registrator/api/v1/IDataSet.java    |  3 +--
 .../api/v1/IDataSetRegistrationTransaction.java   |  3 +--
 .../registrator/api/v1/IDataSetUpdatable.java     |  3 +--
 .../etlserver/registrator/api/v1/IExperiment.java |  3 +--
 .../registrator/api/v1/IExperimentUpdatable.java  |  3 +--
 .../api/v1/IExternalDataManagementSystem.java     |  3 +--
 .../api/v1/IJavaDataSetRegistrationDropboxV1.java |  3 +--
 .../etlserver/registrator/api/v1/IMaterial.java   |  3 +--
 .../registrator/api/v1/IMetaproject.java          |  3 +--
 .../etlserver/registrator/api/v1/IProject.java    |  3 +--
 .../etlserver/registrator/api/v1/ISample.java     |  3 +--
 .../cisd/etlserver/registrator/api/v1/ISpace.java |  3 +--
 .../etlserver/registrator/api/v1/IVocabulary.java |  3 +--
 .../registrator/api/v1/IVocabularyTerm.java       |  3 +--
 .../api/v1/impl/AbstractDataSetImmutable.java     |  3 +--
 .../api/v1/impl/AbstractTransactionState.java     |  3 +--
 .../api/v1/impl/AuthorizationHelper.java          |  3 +--
 .../api/v1/impl/AuthorizationService.java         |  3 +--
 .../registrator/api/v1/impl/ConversionUtils.java  |  3 +--
 .../registrator/api/v1/impl/DataSet.java          |  3 +--
 .../registrator/api/v1/impl/DataSetImmutable.java |  3 +--
 .../v1/impl/DataSetRegistrationTransaction.java   |  3 +--
 .../registrator/api/v1/impl/DataSetUpdatable.java |  3 +--
 .../registrator/api/v1/impl/Experiment.java       |  3 +--
 .../api/v1/impl/ExperimentImmutable.java          |  3 +--
 .../api/v1/impl/ExperimentUpdatable.java          |  3 +--
 .../api/v1/impl/ExternalDataManagementSystem.java |  3 +--
 .../ExternalDataManagementSystemImmutable.java    |  3 +--
 .../registrator/api/v1/impl/Material.java         |  3 +--
 .../api/v1/impl/MaterialImmutable.java            |  3 +--
 .../registrator/api/v1/impl/Metaproject.java      |  3 +--
 .../api/v1/impl/MetaprojectAssignments.java       |  3 +--
 .../api/v1/impl/MetaprojectImmutable.java         |  3 +--
 .../registrator/api/v1/impl/Project.java          |  3 +--
 .../registrator/api/v1/impl/ProjectImmutable.java |  3 +--
 .../api/v1/impl/PropertyAssignmentImmutable.java  |  3 +--
 .../api/v1/impl/RollbackConfigurator.java         |  3 +--
 .../registrator/api/v1/impl/RollbackStack.java    |  3 +--
 .../etlserver/registrator/api/v1/impl/Sample.java |  3 +--
 .../registrator/api/v1/impl/SampleImmutable.java  |  3 +--
 .../registrator/api/v1/impl/SearchService.java    |  3 +--
 .../etlserver/registrator/api/v1/impl/Space.java  |  3 +--
 .../registrator/api/v1/impl/SpaceImmutable.java   |  3 +--
 .../registrator/api/v1/impl/Vocabulary.java       |  3 +--
 .../api/v1/impl/VocabularyImmutable.java          |  3 +--
 .../registrator/api/v1/impl/VocabularyTerm.java   |  3 +--
 .../api/v1/impl/VocabularyTermImmutable.java      |  3 +--
 .../AbstractJavaDataSetRegistrationDropboxV2.java |  3 +--
 .../api/v2/DataSetRegistrationServiceV2.java      |  3 +--
 .../DataSetRegistrationTransactionV2Delegate.java |  3 +--
 .../api/v2/IDSSRegistrationLogger.java            |  3 +--
 .../etlserver/registrator/api/v2/IDataSet.java    |  3 +--
 .../api/v2/IDataSetRegistrationTransactionV2.java |  3 +--
 .../registrator/api/v2/IDataSetUpdatable.java     |  3 +--
 .../etlserver/registrator/api/v2/IExperiment.java |  3 +--
 .../registrator/api/v2/IExperimentUpdatable.java  |  3 +--
 .../api/v2/IExternalDataManagementSystem.java     |  3 +--
 .../api/v2/IJavaDataSetRegistrationDropboxV2.java |  3 +--
 .../etlserver/registrator/api/v2/IMaterial.java   |  3 +--
 .../registrator/api/v2/IMetaproject.java          |  3 +--
 .../etlserver/registrator/api/v2/IProject.java    |  3 +--
 .../etlserver/registrator/api/v2/ISample.java     |  3 +--
 .../cisd/etlserver/registrator/api/v2/ISpace.java |  3 +--
 .../etlserver/registrator/api/v2/IVocabulary.java |  3 +--
 .../registrator/api/v2/IVocabularyTerm.java       |  3 +--
 .../api/v2/JavaTopLevelDataSetHandlerV2.java      |  3 +--
 ...AsJavaDataSetRegistrationDropboxV2Wrapper.java |  3 +--
 .../v2/JythonDataSetRegistrationServiceV2.java    |  3 +--
 .../api/v2/JythonTopLevelDataSetHandlerV2.java    |  3 +--
 .../api/v2/impl/AbstractDataSetImmutable.java     |  3 +--
 .../api/v2/impl/AbstractTransactionState.java     |  3 +--
 .../api/v2/impl/AttachmentImmutable.java          |  3 +--
 .../api/v2/impl/AuthorizationGroupImmutable.java  |  3 +--
 .../api/v2/impl/AuthorizationHelper.java          |  3 +--
 .../api/v2/impl/AuthorizationService.java         |  3 +--
 .../registrator/api/v2/impl/ConversionUtils.java  |  3 +--
 .../registrator/api/v2/impl/DataSet.java          |  3 +--
 .../registrator/api/v2/impl/DataSetImmutable.java |  3 +--
 .../v2/impl/DataSetRegistrationTransaction.java   |  3 +--
 .../registrator/api/v2/impl/DataSetUpdatable.java |  3 +--
 .../registrator/api/v2/impl/Experiment.java       |  3 +--
 .../api/v2/impl/ExperimentImmutable.java          |  3 +--
 .../api/v2/impl/ExperimentUpdatable.java          |  3 +--
 .../api/v2/impl/ExternalDataManagementSystem.java |  3 +--
 .../ExternalDataManagementSystemImmutable.java    |  3 +--
 .../registrator/api/v2/impl/Material.java         |  3 +--
 .../api/v2/impl/MaterialImmutable.java            |  3 +--
 .../registrator/api/v2/impl/Metaproject.java      |  3 +--
 .../api/v2/impl/MetaprojectAssignments.java       |  3 +--
 .../api/v2/impl/MetaprojectImmutable.java         |  3 +--
 .../registrator/api/v2/impl/Project.java          |  3 +--
 .../registrator/api/v2/impl/ProjectImmutable.java |  3 +--
 .../api/v2/impl/PropertyAssignmentImmutable.java  |  3 +--
 .../api/v2/impl/RoleAssignmentImmutable.java      |  3 +--
 .../etlserver/registrator/api/v2/impl/Sample.java |  3 +--
 .../registrator/api/v2/impl/SampleImmutable.java  |  3 +--
 .../registrator/api/v2/impl/SearchService.java    |  3 +--
 .../etlserver/registrator/api/v2/impl/Space.java  |  3 +--
 .../registrator/api/v2/impl/SpaceImmutable.java   |  3 +--
 .../registrator/api/v2/impl/UserImmutable.java    |  3 +--
 .../registrator/api/v2/impl/Vocabulary.java       |  3 +--
 .../api/v2/impl/VocabularyImmutable.java          |  3 +--
 .../registrator/api/v2/impl/VocabularyTerm.java   |  3 +--
 .../api/v2/impl/VocabularyTermImmutable.java      |  3 +--
 .../monitor/DssRegistrationHealthMonitor.java     |  3 +--
 .../monitor/IDssRegistrationHealthMonitor.java    |  3 +--
 .../recovery/AbstractRecoveryState.java           |  3 +--
 .../recovery/AutoRecoverySettings.java            |  3 +--
 .../recovery/ContainerRecoveryAlgorithm.java      |  3 +--
 .../DataSetStoragePrecommitRecoveryAlgorithm.java |  3 +--
 .../DataSetStoragePrecommitRecoveryState.java     |  3 +--
 .../recovery/DataSetStorageRecoveryAlgorithm.java |  3 +--
 .../recovery/DataSetStorageRecoveryInfo.java      |  3 +--
 .../recovery/DataSetStorageRecoveryManager.java   |  3 +--
 .../DataSetStorageStorageRecoveryState.java       |  3 +--
 .../DataSetStorageStoredRecoveryAlgorithm.java    |  3 +--
 ...IDataSetStorageRecoveryAlgorithmWithState.java |  3 +--
 .../recovery/IDataSetStorageRecoveryManager.java  |  3 +--
 ...AbstractDataSetRegistrationDetailsFactory.java |  3 +--
 .../v1/AbstractNoFileDataSetStorageAlgorithm.java |  3 +--
 ...tractOmniscientTopLevelDataSetRegistrator.java |  3 +--
 ...bstractProgrammableTopLevelDataSetHandler.java |  3 +--
 .../v1/ConfiguredOnErrorActionDecision.java       |  3 +--
 .../v1/ContainerDataSetStorageAlgorithm.java      |  3 +--
 .../v1/DataSetRegistrationService.java            |  3 +--
 .../registrator/v1/DataSetStorageAlgorithm.java   |  3 +--
 .../v1/DataSetStorageAlgorithmRunner.java         |  3 +--
 .../registrator/v1/DataSetStorageRollbacker.java  |  3 +--
 .../DefaultDataSetRegistrationDetailsFactory.java |  3 +--
 .../v1/DefaultEntityOperationService.java         |  3 +--
 .../v1/IDataSetOnErrorActionDecision.java         |  3 +--
 .../v1/IDataSetRegistrationDetailsFactory.java    |  3 +--
 .../v1/IDataSetRegistrationService.java           |  3 +--
 .../v1/IOmniscientEntityRegistrator.java          |  3 +--
 .../v1/JythonTopLevelDataSetHandler.java          |  3 +--
 .../v1/LinkDataSetStorageAlgorithm.java           |  3 +--
 ...AbstractDataSetRegistrationDetailsFactory.java |  3 +--
 .../v2/AbstractNoFileDataSetStorageAlgorithm.java |  3 +--
 ...tractOmniscientTopLevelDataSetRegistrator.java |  3 +--
 ...bstractProgrammableTopLevelDataSetHandler.java |  3 +--
 .../v2/ConfiguredOnErrorActionDecision.java       |  3 +--
 .../v2/ContainerDataSetStorageAlgorithm.java      |  3 +--
 .../v2/DataSetRegistrationService.java            |  3 +--
 .../registrator/v2/DataSetStorageAlgorithm.java   |  3 +--
 .../v2/DataSetStorageAlgorithmRunner.java         |  3 +--
 .../registrator/v2/DataSetStorageRollbacker.java  |  3 +--
 .../DefaultDataSetRegistrationDetailsFactory.java |  3 +--
 .../v2/DefaultEntityOperationService.java         |  3 +--
 .../v2/IDataSetOnErrorActionDecision.java         |  3 +--
 .../v2/IDataSetRegistrationDetailsFactory.java    |  3 +--
 .../v2/IOmniscientEntityRegistrator.java          |  3 +--
 .../v2/LinkDataSetStorageAlgorithm.java           |  3 +--
 .../threev/AbstractDataSetInfoExtractorFor3V.java |  3 +--
 .../DataSetInfoExtractorForDataAcquisition.java   |  3 +--
 .../DataSetInfoExtractorForImageAnalysis.java     |  3 +--
 .../AbstractPreOrPostRegistrationExecutor.java    |  3 +--
 .../ch/systemsx/cisd/etlserver/utils/Column.java  |  3 +--
 .../cisd/etlserver/utils/FileScanner.java         |  3 +--
 .../etlserver/utils/MaintenanceTaskUtils.java     |  3 +--
 .../etlserver/utils/PostRegistrationExecutor.java |  3 +--
 .../etlserver/utils/PreRegistrationExecutor.java  |  3 +--
 .../etlserver/utils/PreprocessingExecutor.java    |  3 +--
 .../etlserver/utils/TabSeparatedValueTable.java   |  3 +--
 .../cisd/etlserver/utils/TableBuilder.java        |  3 +--
 .../systemsx/cisd/etlserver/utils/Unzipper.java   |  3 +--
 .../etlserver/validation/AbstractValidator.java   |  3 +--
 .../validation/AbstractValidatorFactory.java      |  3 +--
 .../etlserver/validation/AnyValidatorFactory.java |  3 +--
 .../etlserver/validation/ColumnDefinition.java    |  3 +--
 .../etlserver/validation/DataSetValidator.java    |  3 +--
 .../validation/DataSetValidatorForTSV.java        |  3 +--
 .../validation/DefaultValueValidatorFactory.java  |  3 +--
 .../HeaderBasedValueValidatorFactory.java         |  3 +--
 .../validation/IColumnHeaderValidator.java        |  3 +--
 .../etlserver/validation/IDataSetValidator.java   |  3 +--
 .../cisd/etlserver/validation/IValidator.java     |  3 +--
 .../etlserver/validation/IValidatorFactory.java   |  3 +--
 .../validation/NumericValidatorFactory.java       |  3 +--
 .../etlserver/validation/RegExBasedValidator.java |  3 +--
 .../cisd/etlserver/validation/Result.java         |  3 +--
 .../validation/StringValidatorFactory.java        |  3 +--
 .../validation/UniqueGroupValidator.java          |  3 +--
 .../validation/UniqueGroupValidatorFactory.java   |  3 +--
 .../validation/UniqueValidatorFactory.java        |  3 +--
 .../cisd/openbis/dss/BuildAndEnvironmentInfo.java |  3 +--
 .../dss/archiveverifier/batch/BatchResult.java    |  3 +--
 .../batch/DataSetArchiveVerificationResult.java   |  3 +--
 .../batch/DataSetArchiveVerifier.java             |  3 +--
 .../batch/IArchiveFileRepository.java             |  3 +--
 .../batch/IArchiveFileVerifier.java               |  3 +--
 .../batch/IDataSetArchiveVerificationBatch.java   |  3 +--
 .../batch/IDataSetArchiveVerifier.java            |  3 +--
 .../dss/archiveverifier/batch/ResultType.java     |  3 +--
 .../SerialDataSetArchiveVerificationBatch.java    |  3 +--
 .../archiveverifier/batch/VerificationError.java  |  3 +--
 .../batch/VerificationErrorType.java              |  3 +--
 .../DataSetArchiveVerificationBatchFactory.java   |  3 +--
 .../openbis/dss/archiveverifier/cli/Main.java     |  3 +--
 .../dss/archiveverifier/cli/ResultPrinter.java    |  3 +--
 .../FileSystemArchiveFileRepository.java          |  3 +--
 .../filesystem/FlatFileLocator.java               |  3 +--
 .../archiveverifier/filesystem/IFileLocator.java  |  3 +--
 .../filesystem/ShardingFileLocator.java           |  3 +--
 .../archiveverifier/pathinfo/DataSetPathInfo.java |  3 +--
 .../pathinfo/JdbcPathInfoRepository.java          |  3 +--
 .../archiveverifier/pathinfo/PathInfoEntry.java   |  3 +--
 .../verifier/AbstractZipFileVerifier.java         |  3 +--
 .../verifier/CompositeVerifier.java               |  3 +--
 .../dss/archiveverifier/verifier/CrcEnabled.java  |  3 +--
 .../verifier/IArchiveFileContent.java             |  3 +--
 .../verifier/IArchiveFileMetaDataRepository.java  |  3 +--
 .../verifier/ZipFileHeaderVerifier.java           |  3 +--
 .../verifier/ZipFileIntegrityVerifier.java        |  3 +--
 .../openbis/dss/client/admin/AbstractCommand.java |  3 +--
 .../openbis/dss/client/admin/CommonArguments.java |  3 +--
 .../admin/IShareManagerApplicationCommand.java    |  3 +--
 .../dss/client/admin/ListSharesCommand.java       |  3 +--
 .../dss/client/admin/MoveDataSetsCommand.java     |  3 +--
 .../dss/client/admin/ShareManagerApplication.java |  3 +--
 .../dss/client/api/cli/AbstractClient.java        |  3 +--
 .../dss/client/api/cli/AbstractCommand.java       |  3 +--
 .../client/api/cli/AbstractCommandFactory.java    |  3 +--
 .../client/api/cli/AbstractDataSetExecutor.java   |  3 +--
 .../dss/client/api/cli/AbstractDssCommand.java    |  3 +--
 .../dss/client/api/cli/AbstractExecutor.java      |  3 +--
 .../openbis/dss/client/api/cli/CommandGet.java    |  3 +--
 .../openbis/dss/client/api/cli/CommandHelp.java   |  3 +--
 .../openbis/dss/client/api/cli/CommandLs.java     |  3 +--
 .../openbis/dss/client/api/cli/CommandPut.java    |  3 +--
 .../api/cli/CommandTestExtractMetadata.java       |  3 +--
 .../dss/client/api/cli/CommandTestValid.java      |  3 +--
 .../client/api/cli/CompositeCommandFactory.java   |  3 +--
 .../dss/client/api/cli/DataSetArguments.java      |  3 +--
 .../openbis/dss/client/api/cli/DssClient.java     |  3 +--
 .../dss/client/api/cli/DssCommandFactory.java     |  3 +--
 .../dss/client/api/cli/GlobalArguments.java       |  3 +--
 .../cisd/openbis/dss/client/api/cli/ICommand.java |  3 +--
 .../dss/client/api/cli/ICommandFactory.java       |  3 +--
 .../openbis/dss/client/api/cli/ResultCode.java    |  3 +--
 .../api/gui/AbstractEntityPickerDialog.java       |  3 +--
 .../client/api/gui/AbstractEntityPickerPanel.java |  3 +--
 .../dss/client/api/gui/AbstractSwingGUI.java      |  3 +--
 .../api/gui/AbstractTreeEntityPickerDialog.java   |  3 +--
 .../client/api/gui/AddVocabularyTermDialog.java   |  3 +--
 .../dss/client/api/gui/AsyncNodeAction.java       |  3 +--
 .../dss/client/api/gui/ColumnSortingListener.java |  3 +--
 .../dss/client/api/gui/DataSetMetadataPanel.java  |  3 +--
 .../dss/client/api/gui/DataSetPickerDialog.java   |  3 +--
 .../dss/client/api/gui/DataSetPickerPanel.java    |  3 +--
 .../client/api/gui/DataSetPropertiesPanel.java    |  3 +--
 .../dss/client/api/gui/DataSetUploadClient.java   |  3 +--
 .../api/gui/DataSetUploadClientLoginForm.java     |  2 +-
 .../dss/client/api/gui/ErrorMessageDialog.java    |  3 +--
 .../openbis/dss/client/api/gui/ErrorsPanel.java   |  3 +--
 .../client/api/gui/ExperimentPickerDialog.java    |  3 +--
 .../dss/client/api/gui/ExperimentPickerPanel.java |  3 +--
 .../dss/client/api/gui/IProgressListener.java     |  3 +--
 .../dss/client/api/gui/SamplePickerDialog.java    |  3 +--
 .../dss/client/api/gui/SamplePickerPanel.java     |  3 +--
 .../openbis/dss/client/api/gui/UiUtilities.java   |  3 +--
 .../api/gui/UploadStatusTableCellEditor.java      |  3 +--
 .../api/gui/UploadStatusTableCellRenderer.java    |  3 +--
 .../api/gui/VocabularyTermsComboBoxPanel.java     |  3 +--
 .../api/gui/model/DataSetUploadClientModel.java   |  3 +--
 .../api/gui/model/DataSetUploadOperation.java     |  3 +--
 .../api/gui/model/DataSetUploadTableModel.java    |  3 +--
 .../api/gui/model/DssCommunicationState.java      |  3 +--
 .../dss/client/api/gui/model/IAsyncAction.java    |  3 +--
 .../dss/client/api/gui/model/IUserNotifier.java   |  3 +--
 .../dss/client/api/gui/model/Identifier.java      |  3 +--
 .../dss/client/api/gui/model/SamplesDataSets.java |  3 +--
 .../gui/model/SortableFilterableTableModel.java   |  3 +--
 .../api/gui/model/UploadClientSortingUtils.java   |  3 +--
 .../dss/client/api/gui/model/ValidatedFile.java   |  3 +--
 .../dss/client/api/gui/table/BevelArrowIcon.java  |  3 +--
 .../client/api/gui/table/SortButtonRenderer.java  |  3 +--
 .../api/gui/table/TableHeaderMouseListener.java   |  3 +--
 .../api/gui/tree/FilterableMutableTreeNode.java   |  3 +--
 .../cisd/openbis/dss/client/api/v1/DataSet.java   |  3 +--
 .../dss/client/api/v1/DssComponentFactory.java    |  3 +--
 .../dss/client/api/v1/FileInfoDssDownloader.java  |  3 +--
 .../openbis/dss/client/api/v1/IDataSetDss.java    |  3 +--
 .../openbis/dss/client/api/v1/IDssComponent.java  |  3 +--
 .../dss/client/api/v1/IOpenbisServiceFacade.java  |  3 +--
 .../api/v1/IOpenbisServiceFacadeFactory.java      |  3 +--
 .../api/v1/ISimpleOpenbisServiceFacade.java       |  3 +--
 .../api/v1/OpenbisServiceFacadeFactory.java       |  3 +--
 .../dss/client/api/v1/impl/DataSetDss.java        |  3 +--
 .../dss/client/api/v1/impl/DssComponent.java      |  3 +--
 .../client/api/v1/impl/DssServiceRpcFactory.java  |  3 +--
 .../client/api/v1/impl/OpenbisServiceFacade.java  |  3 +--
 .../client/api/v3/IOpenbisServiceFacadeV3.java    |  3 +--
 .../dss/client/api/v3/OpenbisServiceFacadeV3.java |  3 +--
 .../cisd/openbis/dss/generic/DataStoreServer.java |  3 +--
 .../AbstractDataSetDescriptionBasedCommand.java   |  3 +--
 .../AbstractDataSetLocationBasedCommand.java      |  3 +--
 .../generic/server/AbstractDataSetPackager.java   |  3 +--
 .../server/AbstractDatasetDownloadServlet.java    |  3 +--
 .../dss/generic/server/AbstractDssServiceRpc.java |  3 +--
 .../server/AbstractTabularDataGraphServlet.java   |  3 +--
 .../dss/generic/server/ApplicationContext.java    |  3 +--
 .../dss/generic/server/AutoResolveUtils.java      |  2 +-
 .../generic/server/CIFEXRPCServiceFactory.java    |  3 +--
 .../openbis/dss/generic/server/CommandInfo.java   |  3 +--
 .../dss/generic/server/CommandQueueInfo.java      |  3 +--
 .../dss/generic/server/CommandQueueLister.java    |  3 +--
 .../dss/generic/server/ConfigParameters.java      |  3 +--
 .../generic/server/DataSetCommandExecutor.java    |  3 +--
 .../dss/generic/server/DataStoreServer.java       |  3 +--
 ...StoreServerJythonEvaluatorSpringComponent.java |  3 +--
 .../dss/generic/server/DataStoreService.java      |  3 +--
 .../generic/server/DataStoreServiceLogger.java    |  3 +--
 .../DatabaseBasedDataSetPathInfoProvider.java     |  3 +--
 .../generic/server/DatasetAuthorizationCache.java |  3 +--
 .../generic/server/DatasetDownloadServlet.java    |  3 +--
 .../server/DatasetImageOverviewConfiguration.java |  3 +--
 .../server/DatasetImageOverviewServlet.java       |  3 +--
 .../generic/server/DatasetSessionAuthorizer.java  |  3 +--
 .../dss/generic/server/DeletionCommand.java       |  3 +--
 .../dss/generic/server/DirectoryRendererUtil.java |  3 +--
 .../server/DssServiceRpcAuthorizationAdvisor.java |  3 +--
 .../DynamicFileTabularDataGraphServlet.java       |  3 +--
 .../EncapsulatedFilteredBasicOpenBISService.java  |  3 +--
 .../server/EncapsulatedOpenBISService.java        |  3 +--
 .../server/FileTabularDataGraphServlet.java       |  3 +--
 .../dss/generic/server/HTMLErrorRenderer.java     |  3 +--
 .../dss/generic/server/HTMLMessageRenderer.java   |  3 +--
 .../dss/generic/server/HttpInvokerServlet.java    | 15 +++++++++++++++
 .../generic/server/ICIFEXRPCServiceFactory.java   |  3 +--
 .../dss/generic/server/IDataSetCommand.java       |  3 +--
 .../generic/server/IDataSetCommandExecutor.java   |  3 +--
 .../server/IDataSetCommandExecutorFactory.java    |  3 +--
 .../server/IDataSetCommandExecutorProvider.java   |  3 +--
 .../server/IDataSetFileOperationsExecutor.java    |  3 +--
 .../server/IDatasetImageOverviewPlugin.java       |  3 +--
 .../dss/generic/server/IDirectoryRenderer.java    |  3 +--
 .../dss/generic/server/IErrorRenderer.java        |  3 +--
 .../dss/generic/server/IMessageRenderer.java      |  3 +--
 .../dss/generic/server/IRendererFactory.java      |  3 +--
 .../IServiceConversationClientManagerLocal.java   |  3 +--
 .../IServiceConversationServerManagerLocal.java   |  3 +--
 .../generic/server/IServletPropertiesManager.java |  3 +--
 .../dss/generic/server/IStreamRepository.java     |  3 +--
 .../dss/generic/server/IWriterInjector.java       |  3 +--
 .../server/IdentifiedStreamHandlingServlet.java   |  3 +--
 .../dss/generic/server/InputStreamWithPath.java   |  3 +--
 .../KeyBasedDataSetCommandExecutorProvider.java   |  3 +--
 .../LocalDataSetFileOperationsExcecutor.java      |  3 +--
 .../generic/server/OpenbisSessionTokenCache.java  |  3 +--
 .../generic/server/PlainTextRendererFactory.java  |  3 +--
 .../generic/server/ProcessDatasetsCommand.java    |  3 +--
 .../RemoteDataSetFileOperationsExecutor.java      |  3 +--
 .../dss/generic/server/RenderingContext.java      |  3 +--
 .../dss/generic/server/ResponseContentStream.java |  3 +--
 .../server/ServiceConversationClientManager.java  |  3 +--
 .../server/ServiceConversationServerManager.java  |  3 +--
 .../dss/generic/server/SessionTokenManager.java   |  3 +--
 .../SessionWorkspaceFileDownloadServlet.java      |  3 +--
 .../server/SessionWorkspaceFileUploadServlet.java |  3 +--
 .../server/SessionWorkspaceFormUploadServlet.java |  3 +--
 .../generic/server/SessionWorkspaceProvider.java  |  3 +--
 .../dss/generic/server/ShareIdManager.java        |  3 +--
 .../server/SimpleHTMLDirectoryRenderer.java       |  3 +--
 .../generic/server/SimpleHTMLRendererFactory.java |  3 +--
 .../dss/generic/server/StreamRepository.java      |  3 +--
 .../dss/generic/server/TarDataSetPackager.java    |  3 +--
 .../dss/generic/server/UploadingCommand.java      |  3 +--
 .../cisd/openbis/dss/generic/server/Utils.java    |  3 +--
 .../dss/generic/server/ZipDataSetPackager.java    |  3 +--
 .../server/api/v1/DssServiceRpcGeneric.java       |  3 +--
 .../server/api/v1/DssServiceRpcGenericLogger.java |  3 +--
 .../AbstractSearchDomainService.java              |  3 +--
 .../api/v2/sequencedatabases/BlastDatabase.java   |  3 +--
 .../api/v2/sequencedatabases/EchoDatabase.java    |  3 +--
 .../v2/sequencedatabases/FileSearchDomain.java    | 15 +++++++++++++++
 .../BackupDatabaseDescriptionGenerator.java       |  3 +--
 .../server/dbbackup/BackupDatabaseParser.java     |  3 +--
 .../server/fs/FtpPathResolverRegistry.java        |  3 +--
 .../dss/generic/server/fs/ResolverContext.java    |  3 +--
 .../dss/generic/server/fs/api/IResolver.java      |  3 +--
 .../generic/server/fs/api/IResolverContext.java   |  3 +--
 .../generic/server/fs/api/IResolverPlugin.java    |  3 +--
 .../server/fs/api/file/IDirectoryResponse.java    |  3 +--
 .../fs/api/file/IFileSystemViewResponse.java      |  3 +--
 .../generic/server/fs/file/DirectoryResponse.java |  3 +--
 .../dss/generic/server/fs/file/FileResponse.java  |  3 +--
 .../server/fs/file/NonExistingFileResponse.java   |  3 +--
 .../server/fs/plugins/DataSetTypeResolver.java    |  3 +--
 .../server/fs/plugins/FileSystemPlugin.java       |  3 +--
 .../generic/server/fs/plugins/JythonResolver.java |  3 +--
 .../server/fs/plugins/SampleTypeResolver.java     |  3 +--
 .../server/fs/resolver/AbstractResolver.java      |  3 +--
 .../fs/resolver/DataSetContentResolver.java       |  3 +--
 .../fs/resolver/ExperimentLevelResolver.java      |  3 +--
 .../fs/resolver/HierarchicalContentResolver.java  |  3 +--
 .../server/fs/resolver/ProjectLevelResolver.java  |  3 +--
 .../server/fs/resolver/RootLevelResolver.java     |  3 +--
 .../server/fs/resolver/SampleLevelResolver.java   |  3 +--
 .../server/fs/resolver/SpaceLevelResolver.java    |  3 +--
 .../openbis/dss/generic/server/ftp/Cache.java     |  3 +--
 .../dss/generic/server/ftp/DSSFileSystemView.java |  3 +--
 .../dss/generic/server/ftp/FtpConstants.java      |  3 +--
 .../dss/generic/server/ftp/FtpFileFactory.java    |  3 +--
 .../generic/server/ftp/FtpPathResolverConfig.java |  3 +--
 .../server/ftp/FtpPathResolverContext.java        |  3 +--
 .../server/ftp/FtpPathResolverRegistry.java       |  3 +--
 .../openbis/dss/generic/server/ftp/FtpServer.java |  3 +--
 .../dss/generic/server/ftp/FtpServerConfig.java   |  3 +--
 .../openbis/dss/generic/server/ftp/FtpUser.java   |  3 +--
 .../dss/generic/server/ftp/FtpUserManager.java    |  3 +--
 .../dss/generic/server/ftp/IFtpPathResolver.java  |  3 +--
 .../server/ftp/IFtpPathResolverRegistry.java      |  3 +--
 .../cisd/openbis/dss/generic/server/ftp/Node.java |  3 +--
 .../generic/server/ftp/NonExistingFtpFile.java    |  3 +--
 .../server/ftp/resolver/AbstractFtpFile.java      |  3 +--
 .../ftp/resolver/AbstractFtpFileWithContent.java  |  3 +--
 .../server/ftp/resolver/AbstractFtpFolder.java    |  3 +--
 .../ftp/resolver/ExperimentFolderResolver.java    |  3 +--
 .../ftp/resolver/FtpFileEvaluationContext.java    |  3 +--
 .../generic/server/ftp/resolver/FtpFileImpl.java  |  3 +--
 .../ftp/resolver/IExperimentChildrenLister.java   |  3 +--
 .../ftp/resolver/ProjectFolderResolver.java       |  3 +--
 .../server/ftp/resolver/RootFolderResolver.java   |  3 +--
 .../server/ftp/resolver/SpaceFolderResolver.java  |  3 +--
 .../TemplateBasedDataSetResourceResolver.java     |  3 +--
 .../server/graph/AbstractTabularDataGraph.java    |  3 +--
 .../dss/generic/server/graph/HeatmapDataset.java  |  3 +--
 .../generic/server/graph/ITabularDataGraph.java   |  3 +--
 .../server/graph/SpreadsheetColumnTickUnit.java   |  3 +--
 .../TabularDataGraphCollectionConfiguration.java  |  3 +--
 .../graph/TabularDataGraphConfiguration.java      |  3 +--
 .../generic/server/graph/TabularDataHeatmap.java  |  3 +--
 .../graph/TabularDataHeatmapConfiguration.java    |  3 +--
 .../server/graph/TabularDataHistogram.java        |  3 +--
 .../graph/TabularDataHistogramConfiguration.java  |  3 +--
 .../server/graph/TabularDataScatterplot.java      |  3 +--
 .../TabularDataScatterplotConfiguration.java      |  3 +--
 .../generic/server/graph/TabularDataTickUnit.java |  3 +--
 .../server/graph/TabularDataTickUnitSource.java   |  3 +--
 .../oaipmh/AnonymousAuthenticationHandler.java    |  3 +--
 .../oaipmh/BasicHttpAuthenticationHandler.java    |  3 +--
 .../server/oaipmh/IAuthenticationHandler.java     |  3 +--
 .../dss/generic/server/oaipmh/IConfigurable.java  |  3 +--
 .../generic/server/oaipmh/IRequestHandler.java    |  3 +--
 .../server/oaipmh/JythonBasedRequestHandler.java  |  3 +--
 .../dss/generic/server/oaipmh/OaipmhServlet.java  |  3 +--
 .../generic/server/oaipmh/xoai/SimpleItem.java    |  3 +--
 .../server/oaipmh/xoai/SimpleItemIdentifier.java  |  3 +--
 .../server/oaipmh/xoai/SimpleItemRepository.java  |  3 +--
 .../server/oaipmh/xoai/SimpleSetRepository.java   |  3 +--
 .../openbisauth/OpenBISAuthenticationAdvisor.java |  3 +--
 .../OpenBISAuthenticationInterceptor.java         |  3 +--
 ...lAccessTokenConfigFromEncapsulatedService.java | 15 +++++++++++++++
 ...cessTokenConverterFromEncapsulatedService.java | 15 +++++++++++++++
 ...ileBasedImageAnalysisGraphReportingPlugin.java |  3 +--
 .../demo/DatasetModificationReportingPlugin.java  |  3 +--
 .../generic/server/plugins/demo/DemoArchiver.java |  3 +--
 .../server/plugins/demo/DemoOverviewPlugin.java   |  3 +--
 .../server/plugins/demo/DemoProcessingPlugin.java |  3 +--
 .../server/plugins/demo/DemoReportingPlugin.java  |  3 +--
 .../server/plugins/jython/EmailSender.java        |  3 +--
 ...egationServiceReportingPluginScriptRunner.java |  3 +--
 ...egationServiceReportingPluginScriptRunner.java |  3 +--
 .../jython/IPluginScriptRunnerFactory.java        |  3 +--
 .../jython/IProcessingPluginScriptRunner.java     |  3 +--
 .../jython/IReportingPluginScriptRunner.java      |  3 +--
 .../jython/IRequestHandlerPluginScriptRunner.java |  3 +--
 .../server/plugins/jython/ITableModelCreator.java |  3 +--
 .../plugins/jython/JythonAggregationService.java  |  3 +--
 .../plugins/jython/JythonBasedPluginUtils.java    |  3 +--
 .../jython/JythonBasedProcessingPlugin.java       |  3 +--
 .../jython/JythonBasedReportingPlugin.java        |  3 +--
 .../plugins/jython/JythonIngestionService.java    |  3 +--
 .../server/plugins/jython/MailService.java        |  3 +--
 .../plugins/jython/PluginScriptRunnerFactory.java |  3 +--
 .../jython/ReportingBasedProcessingPlugin.java    |  3 +--
 .../jython/SimpleTableModelBuilderAdaptor.java    |  3 +--
 .../dss/generic/server/plugins/jython/Utils.java  |  3 +--
 .../server/plugins/jython/api/IDataSet.java       |  3 +--
 .../server/plugins/jython/api/IEmailSender.java   |  3 +--
 .../server/plugins/jython/api/IMailService.java   |  3 +--
 .../AbstractArchiverProcessingPlugin.java         |  3 +--
 .../AbstractDataMergingReportingPlugin.java       |  3 +--
 .../plugins/standard/AbstractDatastorePlugin.java |  3 +--
 .../standard/AbstractDropboxProcessingPlugin.java |  3 +--
 .../standard/AbstractDssLinkReportingPlugin.java  |  3 +--
 .../AbstractFileTableReportingPlugin.java         |  3 +--
 .../plugins/standard/AbstractPackageManager.java  |  3 +--
 .../AbstractTableModelReportingPlugin.java        |  3 +--
 .../plugins/standard/AggregationService.java      |  3 +--
 .../standard/ArchivingAggregationService.java     |  3 +--
 .../generic/server/plugins/standard/Copier.java   |  3 +--
 ...athInfoDBConsistencyCheckProcessingPlugin.java |  3 +--
 .../server/plugins/standard/DataSetCopier.java    |  3 +--
 .../plugins/standard/DataSetCopierForUsers.java   |  3 +--
 .../standard/DataSetFileOperationsManager.java    |  3 +--
 .../DecoratingTableModelReportingPlugin.java      |  3 +--
 ...utedPackagingDataSetFileOperationsManager.java |  3 +--
 .../plugins/standard/EntityLinksDecorator.java    |  3 +--
 .../server/plugins/standard/FileBasedPause.java   |  3 +--
 .../standard/GenericDssLinkReportingPlugin.java   |  3 +--
 .../plugins/standard/HighWaterMarkChecker.java    | 15 +++++++++++++++
 .../standard/IDataSetFileOperationsManager.java   |  3 +--
 .../IDataSetFileOperationsManagerFactory.java     |  3 +--
 .../plugins/standard/IImmutableCopierFactory.java |  3 +--
 .../server/plugins/standard/IPackageManager.java  |  3 +--
 .../plugins/standard/IPathCopierFactory.java      |  3 +--
 .../standard/ISshCommandExecutorFactory.java      |  3 +--
 .../server/plugins/standard/IStatusChecker.java   |  3 +--
 .../plugins/standard/ImmutableCopierFactory.java  |  3 +--
 .../server/plugins/standard/IngestionService.java |  3 +--
 .../standard/MergedColumnDataReportingPlugin.java |  3 +--
 .../standard/MergedRowDataReportingPlugin.java    |  3 +--
 .../standard/RsyncArchiveCopierFactory.java       |  3 +--
 .../server/plugins/standard/RsyncArchiver.java    |  3 +--
 .../plugins/standard/RsyncCopierFactory.java      |  3 +--
 .../standard/SshCommandExecutorFactory.java       |  3 +--
 .../plugins/standard/TSVViewReportingPlugin.java  |  3 +--
 .../server/plugins/standard/TarArchiver.java      |  3 +--
 .../standard/TarBasedPathInfoProvider.java        |  3 +--
 .../plugins/standard/TarPackageManager.java       |  3 +--
 .../server/plugins/standard/ZipArchiver.java      |  3 +--
 .../plugins/standard/ZipPackageManager.java       |  3 +--
 .../AbstractDataSetFileOperationsManager.java     |  3 +--
 .../standard/archiver/ArchiveDestination.java     |  3 +--
 .../archiver/ArchiveDestinationFactory.java       |  3 +--
 .../CleanUpUnarchivingScratchShareTask.java       |  3 +--
 .../plugins/standard/archiver/FileDeleter.java    |  3 +--
 .../archiver/IMultiDataSetArchiveCleaner.java     |  3 +--
 .../IMultiDataSetFileOperationsManager.java       |  3 +--
 .../archiver/IMultiDataSetPackageManager.java     |  3 +--
 .../archiver/MultiDataSetArchiveCleaner.java      |  3 +--
 ...iDataSetArchiveSanityCheckMaintenanceTask.java | 15 +++++++++++++++
 .../standard/archiver/MultiDataSetArchiver.java   |  3 +--
 .../archiver/MultiDataSetArchivingFinalizer.java  |  3 +--
 .../archiver/MultiDataSetArchivingUtils.java      |  3 +--
 .../MultiDataSetDeletionMaintenanceTask.java      | 15 +++++++++++++++
 .../MultiDataSetFileOperationsManager.java        |  3 +--
 .../archiver/MultiDataSetPackageManager.java      |  3 +--
 .../MultiDataSetUnarchivingMaintenanceTask.java   |  3 +--
 .../plugins/standard/archiver/RetryCaller.java    |  3 +--
 .../IMultiDataSetArchiverDBTransaction.java       |  3 +--
 .../dataaccess/IMultiDataSetArchiverQueryDAO.java |  3 +--
 .../IMultiDataSetArchiverReadonlyQueryDAO.java    |  3 +--
 .../MultiDataSetArchiverContainerDTO.java         |  3 +--
 .../MultiDataSetArchiverDBTransaction.java        |  3 +--
 .../MultiDataSetArchiverDBVersionHolder.java      |  3 +--
 .../MultiDataSetArchiverDataSetDTO.java           |  3 +--
 .../MultiDataSetArchiverDataSourceUtil.java       |  3 +--
 .../plugins/tasks/ArchiverPluginFactory.java      |  3 +--
 .../plugins/tasks/IPluginTaskInfoProvider.java    |  3 +--
 .../plugins/tasks/IReportingPluginTask.java       |  3 +--
 .../plugins/tasks/IterativeTableModelBuilder.java |  3 +--
 .../server/plugins/tasks/PluginTaskFactory.java   |  3 +--
 .../plugins/tasks/PluginTaskInfoProvider.java     |  3 +--
 .../server/plugins/tasks/PluginTaskProvider.java  |  3 +--
 .../dss/generic/shared/AbstractShareFinder.java   |  3 +--
 .../dss/generic/shared/ArchiveFolders.java        |  3 +--
 .../dss/generic/shared/ArchiverTaskContext.java   |  3 +--
 .../openbis/dss/generic/shared/Constants.java     |  3 +--
 .../shared/DataSetAwareHierarchicalContent.java   |  3 +--
 .../DataSetAwareHierarchicalContentNode.java      |  3 +--
 .../generic/shared/DataSetDirectoryProvider.java  |  3 +--
 .../generic/shared/DataSetProcessingContext.java  |  3 +--
 .../shared/DataSetTypeBasedShareFinder.java       |  3 +--
 .../dss/generic/shared/DataSourceProvider.java    |  3 +--
 .../generic/shared/DataSourceQueryService.java    |  3 +--
 .../generic/shared/DataStoreServerV3Factory.java  |  3 +--
 .../generic/shared/DefaultDataSourceFactory.java  |  3 +--
 .../shared/ExperimentBasedShareFinder.java        |  3 +--
 .../HierarchicalContentChecksumProvider.java      |  3 +--
 .../shared/HierarchicalContentProvider.java       |  3 +--
 .../shared/HierarchicalContentTraverseUtil.java   |  3 +--
 .../dss/generic/shared/IArchiverPlugin.java       |  3 +--
 .../dss/generic/shared/IChecksumProvider.java     |  3 +--
 .../dss/generic/shared/IConfigProvider.java       |  3 +--
 .../dss/generic/shared/IDataSetDeleter.java       |  3 +--
 .../generic/shared/IDataSetDirectoryProvider.java |  3 +--
 .../generic/shared/IDataSetPathInfoProvider.java  |  3 +--
 .../dss/generic/shared/IDataSetStatusUpdater.java |  3 +--
 .../dss/generic/shared/IDataSourceProvider.java   |  3 +--
 .../generic/shared/IDataStoreServiceInternal.java |  3 +--
 .../generic/shared/IDatabaseVersionHolder.java    |  3 +--
 .../shared/IEncapsulatedBasicOpenBISService.java  |  3 +--
 .../shared/IEncapsulatedOpenBISService.java       |  3 +--
 .../shared/IHierarchicalContentNodeVisitor.java   |  3 +--
 .../shared/IHierarchicalContentProvider.java      |  3 +--
 .../shared/IPostRegistrationDatasetHandler.java   |  3 +--
 .../dss/generic/shared/IProcessingPluginTask.java |  3 +--
 .../dss/generic/shared/IPutDataSetService.java    |  3 +--
 .../openbis/dss/generic/shared/IShareFinder.java  |  3 +--
 .../dss/generic/shared/IShareIdManager.java       |  3 +--
 .../shared/ISingleDataSetPathInfoProvider.java    |  3 +--
 .../openbis/dss/generic/shared/ISpeedChecker.java | 15 +++++++++++++++
 .../generic/shared/IUnarchivingPreparation.java   |  3 +--
 .../shared/IdentifierAttributeMappingManager.java |  3 +--
 .../generic/shared/IncomingShareIdProvider.java   |  3 +--
 .../dss/generic/shared/ManagedAuthentication.java |  3 +--
 .../generic/shared/MappingBasedShareFinder.java   |  3 +--
 .../shared/PathInfoDatabaseVersionHolder.java     |  3 +--
 .../dss/generic/shared/ProcessingStatus.java      |  3 +--
 .../QueueingDataSetStatusUpdaterService.java      |  3 +--
 .../dss/generic/shared/ServiceProvider.java       |  3 +--
 .../generic/shared/SimpleDataSourceFactory.java   |  3 +--
 .../dss/generic/shared/SimpleShareFinder.java     |  3 +--
 .../openbis/dss/generic/shared/SpeedChecker.java  |  3 +--
 .../generic/shared/SpeedOptimizedShareFinder.java |  3 +--
 .../dss/generic/shared/StandardShareFinder.java   |  3 +--
 .../api/internal/IDataSourceQueryService.java     |  3 +--
 .../api/internal/ISessionWorkspaceProvider.java   |  3 +--
 .../AbstractDataSetAccessPredicate.java           |  3 +--
 .../authorization/AuthorizationGuard.java         |  3 +--
 .../authorization/DataSetAccessGuard.java         |  3 +--
 .../authorization/DataSetCodeStringPredicate.java |  3 +--
 .../authorization/DataSetFileDTOPredicate.java    |  3 +--
 .../DssSessionAuthorizationHolder.java            |  3 +--
 .../IDssServiceRpcGenericInternal.java            |  3 +--
 .../authorization/IDssSessionAuthorizer.java      |  3 +--
 .../authorization/NewDataSetPredicate.java        |  3 +--
 .../internal/authorization/PrivilegeLevel.java    |  3 +--
 .../api/internal/v1/IDataSetContentProvider.java  |  3 +--
 .../shared/api/internal/v1/IDataSetImmutable.java |  3 +--
 .../shared/api/internal/v1/IDataSetPredicate.java |  3 +--
 .../api/internal/v1/IExperimentImmutable.java     |  3 +--
 .../IExternalDataManagementSystemImmutable.java   |  3 +--
 .../api/internal/v1/IMaterialImmutable.java       |  3 +--
 .../api/internal/v1/IMetaprojectAssignments.java  |  3 +--
 .../api/internal/v1/IMetaprojectContent.java      |  3 +--
 .../api/internal/v1/IMetaprojectImmutable.java    |  3 +--
 .../shared/api/internal/v1/IProjectImmutable.java |  3 +--
 .../internal/v1/IPropertyAssignmentImmutable.java |  3 +--
 .../shared/api/internal/v1/ISampleImmutable.java  |  3 +--
 .../shared/api/internal/v1/ISearchService.java    |  3 +--
 .../shared/api/internal/v1/ISpaceImmutable.java   |  3 +--
 .../api/internal/v1/IVocabularyImmutable.java     |  3 +--
 .../api/internal/v1/IVocabularyTermImmutable.java |  3 +--
 .../internal/v1/MaterialIdentifierCollection.java |  3 +--
 .../IAuthorizationGuardPredicate.java             |  3 +--
 .../v1/authorization/IAuthorizationService.java   |  3 +--
 .../api/internal/v2/IAttachmentImmutable.java     |  3 +--
 .../internal/v2/IAuthorizationGroupImmutable.java |  3 +--
 .../api/internal/v2/IDataSetContentProvider.java  |  3 +--
 .../shared/api/internal/v2/IDataSetImmutable.java |  3 +--
 .../shared/api/internal/v2/IDataSetPredicate.java |  3 +--
 .../api/internal/v2/IExperimentImmutable.java     |  3 +--
 .../IExternalDataManagementSystemImmutable.java   |  3 +--
 .../api/internal/v2/IMaterialImmutable.java       |  3 +--
 .../api/internal/v2/IMetaprojectAssignments.java  |  3 +--
 .../api/internal/v2/IMetaprojectContent.java      |  3 +--
 .../api/internal/v2/IMetaprojectImmutable.java    |  3 +--
 .../shared/api/internal/v2/IProjectImmutable.java |  3 +--
 .../internal/v2/IPropertyAssignmentImmutable.java |  3 +--
 .../api/internal/v2/IRoleAssignmentImmutable.java |  3 +--
 .../shared/api/internal/v2/ISampleImmutable.java  |  3 +--
 .../api/internal/v2/ISearchDomainService.java     |  3 +--
 .../shared/api/internal/v2/ISearchService.java    |  3 +--
 .../shared/api/internal/v2/ISpaceImmutable.java   |  3 +--
 .../shared/api/internal/v2/IUserImmutable.java    |  3 +--
 .../api/internal/v2/IVocabularyImmutable.java     |  3 +--
 .../api/internal/v2/IVocabularyTermImmutable.java |  3 +--
 .../internal/v2/MaterialIdentifierCollection.java |  3 +--
 .../IAuthorizationGuardPredicate.java             |  3 +--
 .../v2/authorization/IAuthorizationService.java   |  3 +--
 .../dss/generic/shared/api/v1/DataSetFileDTO.java |  3 +--
 .../shared/api/v1/DataStoreApiUrlUtilities.java   |  3 +--
 .../generic/shared/api/v1/FileInfoDssBuilder.java |  3 +--
 .../dss/generic/shared/api/v1/FileInfoDssDTO.java |  3 +--
 .../api/v1/HierarchicalFileInfoDssBuilder.java    |  3 +--
 .../shared/api/v1/IDssServiceRpcGeneric.java      |  3 +--
 .../dss/generic/shared/api/v1/NewDataSetDTO.java  |  3 +--
 .../shared/api/v1/NewDataSetDTOBuilder.java       |  3 +--
 .../shared/api/v1/NewDataSetMetadataDTO.java      |  3 +--
 .../dss/generic/shared/api/v1/ShareInfo.java      |  3 +--
 .../dss/generic/shared/api/v1/UploadObserver.java | 15 +++++++++++++++
 .../shared/api/v1/validation/ValidationError.java |  3 +--
 .../api/v1/validation/ValidationScriptReader.java |  3 +--
 .../api/v1/validation/ValidationScriptRunner.java |  3 +--
 .../dss/generic/shared/content/ContentCache.java  |  3 +--
 .../shared/content/DelayedPersistenceManager.java |  3 +--
 .../content/DssServiceRpcGenericFactory.java      |  3 +--
 .../dss/generic/shared/content/IContentCache.java |  3 +--
 .../content/IDssServiceRpcGenericFactory.java     |  3 +--
 .../shared/content/IPersistenceManager.java       |  3 +--
 ...PathInfoDBAwareHierarchicalContentFactory.java | 15 +++++++++++++++
 .../PathInfoDBOnlyHierarchicalContentFactory.java |  3 +--
 .../PathInfoProviderBasedHierarchicalContent.java |  3 +--
 .../shared/content/RemoteHierarchicalContent.java |  3 +--
 .../content/RemoteHierarchicalContentNode.java    |  3 +--
 .../content/SimpleFileBasePersistenceManager.java |  3 +--
 .../shared/dto/AtomicEntityOperationDetails.java  |  3 +--
 .../shared/dto/DataSetCodesWithStatus.java        |  3 +--
 .../generic/shared/dto/DataSetInformation.java    |  3 +--
 .../dss/generic/shared/dto/DataSetPathInfo.java   |  3 +--
 .../dto/DataSetRegistrationInformation.java       |  3 +--
 .../openbis/dss/generic/shared/dto/PathInfo.java  |  3 +--
 .../generic/shared/dto/PluginServletConfig.java   |  3 +--
 .../cisd/openbis/dss/generic/shared/dto/Size.java |  3 +--
 .../utils/AbstractDatasetDropboxHandler.java      |  3 +--
 .../dss/generic/shared/utils/AutoSymlink.java     |  3 +--
 .../dss/generic/shared/utils/BlastUtils.java      |  3 +--
 .../generic/shared/utils/CodeAndLabelUtil.java    |  3 +--
 .../generic/shared/utils/CsvFileReaderHelper.java |  3 +--
 .../DataSetAndPathInfoDBConsistencyChecker.java   |  3 +--
 .../shared/utils/DataSetExistenceChecker.java     |  3 +--
 .../generic/shared/utils/DatasetFileLines.java    |  3 +--
 .../generic/shared/utils/DatasetLocationUtil.java |  3 +--
 .../shared/utils/DssCrossOriginFilter.java        |  3 +--
 .../dss/generic/shared/utils/DssPluginType.java   |  3 +--
 .../shared/utils/DssPropertyParametersUtil.java   |  3 +--
 .../dss/generic/shared/utils/ExcelFileReader.java |  3 +--
 .../dss/generic/shared/utils/ITabularData.java    |  3 +--
 .../dss/generic/shared/utils/ImageUtil.java       |  3 +--
 .../generic/shared/utils/ImageUtilReaderPool.java |  3 +--
 .../generic/shared/utils/Jython27ClassLoader.java |  3 +--
 .../shared/utils/Jython27FactoriesProvider.java   |  3 +--
 .../dss/generic/shared/utils/MetaDataBuilder.java |  3 +--
 .../shared/utils/PathInfoDataSourceProvider.java  |  3 +--
 .../generic/shared/utils/PngWritingHelper.java    |  3 +--
 .../PostgresPlusFileSystemFreeSpaceProvider.java  |  3 +--
 .../dss/generic/shared/utils/RSyncConfig.java     | 15 +++++++++++++++
 .../generic/shared/utils/SegmentedStoreUtils.java |  3 +--
 .../shared/utils/SessionWorkspaceUtil.java        |  3 +--
 .../openbis/dss/generic/shared/utils/Share.java   |  3 +--
 .../dss/generic/shared/utils/ShareFactory.java    |  3 +--
 .../dss/generic/shared/utils/SharesHolder.java    |  3 +--
 .../dss/generic/shared/utils/SpeedUtils.java      |  3 +--
 .../dss/generic/shared/utils/ToStringUtil.java    |  3 +--
 .../java/org/python/core/SyspathArchiveHack.java  | 15 +++++++++++++++
 .../dss/api/v3/DataSetFileCreationBuilder.java    | 15 +++++++++++++++
 .../generic/dss/api/v3/PathInfoFeederTest.java    | 15 +++++++++++++++
 .../v3/AbstractArchiveUnarchiveDataSetTest.java   |  3 +--
 .../dss/systemtest/api/v3/AbstractFileTest.java   | 15 +++++++++++++++
 .../systemtest/api/v3/AggregationServiceTest.java |  3 +--
 .../dss/systemtest/api/v3/ArchiveDataSetTest.java |  3 +--
 .../api/v3/CreateExperimentsImportTest.java       |  3 +--
 .../api/v3/CreateMaterialsImportTest.java         |  3 +--
 .../api/v3/CreateSamplesImportTest.java           |  3 +--
 .../api/v3/CreateUploadedDataSetsTest.java        |  3 +--
 .../dss/systemtest/api/v3/CustomImportTest.java   |  3 +--
 .../dss/systemtest/api/v3/DownloadFileTest.java   | 15 +++++++++++++++
 .../dss/systemtest/api/v3/GeneralImportTest.java  |  3 +--
 .../dss/systemtest/api/v3/LockDataSetTest.java    |  3 +--
 .../dss/systemtest/api/v3/ObjectsImportTest.java  |  3 +--
 .../systemtest/api/v3/ProcessingServiceTest.java  |  3 +--
 .../systemtest/api/v3/ReportingServiceTest.java   |  3 +--
 .../api/v3/SearchDomainServiceTest.java           |  3 +--
 .../dss/systemtest/api/v3/SearchFileTest.java     | 15 +++++++++++++++
 .../systemtest/api/v3/UnarchiveDataSetTest.java   |  3 +--
 .../dss/systemtest/api/v3/UnlockDataSetTest.java  |  3 +--
 .../api/v3/UpdateDataSetsImportTest.java          |  3 +--
 .../api/v3/UpdateExperimentsImportTest.java       |  3 +--
 .../api/v3/UpdateMaterialsImportTest.java         |  3 +--
 .../api/v3/UpdateSamplesImportTest.java           |  3 +--
 .../dss/systemtest/api/v3/UploadServletTest.java  |  3 +--
 .../DataSetRegistrationCleanUpTaskTest.java       |  3 +--
 .../plugins/sync/common/EntityRetrieverTest.java  |  3 +--
 .../sync/datasource/DataSourceUtilsTest.java      |  3 +--
 .../synchronizer/MasterDataSynchronizerTest.java  | 15 +++++++++++++++
 .../AbstractStorageProcessorWithDropboxTest.java  |  3 +--
 .../cisd/etlserver/ChannelSetHelperTest.java      |  3 +--
 .../cisd/etlserver/CifexStorageProcessorTest.java |  3 +--
 .../cisd/etlserver/CodeExtractortTestCase.java    |  3 +--
 .../DataSetNameEntitiesProviderTest.java          |  3 +--
 .../DataSetRegistrationAlgorithmTest.java         |  3 +--
 .../cisd/etlserver/DataStrategyStoreTest.java     |  3 +--
 .../DefaultDataSetInfoExtractorTest.java          |  3 +--
 .../etlserver/DefaultStorageProcessorTest.java    |  3 +--
 .../etlserver/DispatcherStorageProcessorTest.java |  3 +--
 .../DssRegistrationLogDirectoryHelperTest.java    |  3 +--
 .../cisd/etlserver/FileBasedFileTest.java         |  3 +--
 .../cisd/etlserver/FileTypeExtractorTest.java     |  3 +--
 .../cisd/etlserver/HCSImageCheckListTest.java     |  3 +--
 .../etlserver/IdentifiedDataStrategyTest.java     |  3 +--
 .../java/ch/systemsx/cisd/etlserver/MainTest.java |  3 +--
 .../cisd/etlserver/NamedDataStrategyTest.java     |  3 +--
 .../cisd/etlserver/SimpleTypeExtractorTest.java   |  3 +--
 .../cisd/etlserver/StandardProcessorTest.java     |  3 +--
 .../cisd/etlserver/ThreadParametersTest.java      |  3 +--
 .../etlserver/TransferredDataSetHandlerTest.java  |  3 +--
 .../v1/PutDataSetTopLevelDataSetHandlerTest.java  |  3 +--
 ...estDataSetTypeToTopLevelRegistratorMapper.java |  3 +--
 .../SampleAndDatasetRegistrationHandlerTest.java  |  3 +--
 .../SampleDataSetPairParserObjectFactoryTest.java |  3 +--
 .../hdf5/AbstractHDF5StorageProcessorTest.java    |  3 +--
 .../HDF5StorageProcessorNoCompressionTest.java    |  3 +--
 .../HDF5StorageProcessorWithCompressionTest.java  |  3 +--
 .../cisd/etlserver/hdf5/Hdf5ConcurrencyTest.java  |  3 +--
 ...aSetAndPathInfoDBConsistencyCheckTaskTest.java |  3 +--
 .../DatabaseBasedDataSetPathsInfoFeederTest.java  |  3 +--
 .../cisd/etlserver/path/IPathsInfoDAOTest.java    |  3 +--
 .../cisd/etlserver/path/MockPathsInfoDAO.java     |  3 +--
 ...thInfoDatabaseChecksumCalculationTaskTest.java |  3 +--
 .../path/PathInfoDatabaseFeedingTaskTest.java     |  3 +--
 .../path/PathInfoDatabaseRefreshingTaskTest.java  |  3 +--
 .../cisd/etlserver/path/TimeIntervalTest.java     |  3 +--
 .../AbstractAutoArchiverPolicyTestCase.java       |  3 +--
 .../etlserver/plugins/AutoArchiverTaskTest.java   |  3 +--
 .../BlastDatabaseCreationMaintenanceTaskTest.java |  3 +--
 .../etlserver/plugins/ByExperimentPolicyTest.java | 15 +++++++++++++++
 .../etlserver/plugins/ByPoliceAbstractTest.java   |  3 +--
 .../cisd/etlserver/plugins/BySpacePolicyTest.java | 15 +++++++++++++++
 ...tedInApplicationServerMaintenanceTaskTest.java |  3 +--
 .../plugins/ExperimentBasedArchivingTaskTest.java |  3 +--
 .../FastaFileBuilderForDataSetFilesTest.java      |  3 +--
 .../FileSystemMonitoringMaintenanceTaskTest.java  |  3 +--
 ...penbisDBFromPathInfoDBMaintenanceTaskTest.java |  3 +--
 .../etlserver/plugins/GroupingPolicyTest.java     |  3 +--
 .../plugins/HierarchicalStorageUpdaterTest.java   |  3 +--
 .../plugins/LastSeenDataSetFileContentTest.java   |  3 +--
 .../plugins/SegmentedStoreShufflingTaskTest.java  |  3 +--
 .../plugins/SimpleShufflingShareFinderTest.java   |  3 +--
 .../etlserver/plugins/SimpleShufflingTest.java    |  3 +--
 .../TemplateBasedLinkNamingStrategyTest.java      |  3 +--
 .../ArchivingPostRegistrationTaskTest.java        |  3 +--
 .../postregistration/EagerShufflingTaskTest.java  |  3 +--
 .../postregistration/NotifyingTaskTest.java       |  3 +--
 .../PostRegistrationMaintenanceTaskTest.java      |  3 +--
 .../RequestArchivingPostRegistrationTaskTest.java |  3 +--
 .../SecondCopyPostRegistrationTaskTest.java       |  3 +--
 .../AbstractJythonDataSetHandlerTest.java         |  3 +--
 .../ConfiguredOnErrorActionDecisionTest.java      |  3 +--
 .../registrator/DataSetStorageRollbackerTest.java |  3 +--
 .../registrator/ITestingDataSetHandler.java       | 15 +++++++++++++++
 .../cisd/etlserver/registrator/JavaAllHooks.java  |  3 +--
 .../etlserver/registrator/JavaV2DyingProgram.java |  3 +--
 .../etlserver/registrator/JavaV2FileNotFound.java |  3 +--
 .../registrator/JavaV2SimpleTestcase.java         |  3 +--
 .../JavaV2TestcasePostregistrationHookFailed.java |  3 +--
 .../JavaV2TestcasePreregistrationHookFailed.java  |  3 +--
 .../JavaV2TestcaseRegistrationContext.java        |  3 +--
 .../registrator/JavaV2TestcaseRollback.java       |  3 +--
 .../JavaV2TestcaseWithoutPostStorage.java         |  3 +--
 .../registrator/JythonDropboxRecoveryTest.java    |  3 +--
 .../etlserver/registrator/JythonHookTestTool.java |  3 +--
 ...honTopLevelDataSetRegistratorRollbackTest.java |  3 +--
 .../JythonTopLevelDataSetRegistratorTest.java     |  3 +--
 .../registrator/MarkerFileUtilityTest.java        |  3 +--
 .../registrator/TestingDataSetHandler.java        | 15 +++++++++++++++
 .../TestingDataSetHandlerExpectations.java        | 15 +++++++++++++++
 .../registrator/TestingDataSetHandlerJavaV2.java  |  3 +--
 .../registrator/TestingDataSetHandlerV2.java      | 15 +++++++++++++++
 .../registrator/api/impl/RollbackStackTest.java   |  3 +--
 .../v1/impl/AbstractTestWithRollbackStack.java    |  3 +--
 .../impl/DataSetRegistrationTransactionTest.java  |  3 +--
 .../registrator/api/v1/impl/DataSetTest.java      |  3 +--
 .../impl/ExceptionThrowingStorageProcessor.java   |  3 +--
 .../registrator/api/v1/impl/FileCommandsTest.java |  3 +--
 ...AlignmentJavaDataSetRegistrationDropboxV2.java |  3 +--
 .../ExampleJavaDataSetRegistrationDropboxV2.java  |  3 +--
 ...ataSetInfoExtractorForDataAcquisitionTest.java |  3 +--
 .../DataSetInfoExtractorForImageAnalysisTest.java |  3 +--
 .../cisd/etlserver/utils/FileScannerTest.java     |  3 +--
 .../utils/PreRegistrationExecutorTest.java        |  3 +--
 .../utils/TabSeparatedValueTableTest.java         |  3 +--
 .../cisd/etlserver/utils/TableBuilderTest.java    |  3 +--
 .../validation/ColumnDefinitionTest.java          |  3 +--
 .../validation/DataSetValidatorForTSVTest.java    |  3 +--
 .../validation/DataSetValidatorTest.java          |  3 +--
 .../HeaderBasedValueValidatorFactoryTest.java     |  3 +--
 .../validation/NumericValidatorFactoryTest.java   |  3 +--
 .../validation/StringValidatorFactoryTest.java    |  3 +--
 .../UniqueGroupValidatorFactoryTest.java          |  3 +--
 .../validation/UniqueValidatorFactoryTest.java    |  3 +--
 .../datastoreserver/DependencyCheckingTest.java   |  3 +--
 .../systemtests/AbstractQueryFacadeTest.java      |  3 +--
 .../systemtests/AlwaysStopCondition.java          |  3 +--
 .../systemtests/AndStopCondition.java             |  3 +--
 .../systemtests/AttachmentsDropboxTest.java       |  3 +--
 .../systemtests/ContainsCondition.java            |  3 +--
 .../systemtests/CountStopCondition.java           |  3 +--
 .../CreateSpacesFromDssSystemTest.java            |  3 +--
 .../systemtests/DropBoxFailsCondition.java        |  3 +--
 .../systemtests/DropBoxNameCondition.java         |  3 +--
 .../DropBoxSuccessfullyFinishedCondition.java     |  3 +--
 .../systemtests/DssComponentTest.java             |  3 +--
 .../systemtests/ErrorStopCondition.java           |  3 +--
 .../FeatureRichDataSetImportSystemTest.java       |  3 +--
 .../systemtests/GenericDropboxSystemTest.java     |  3 +--
 .../systemtests/GenericSystemTest.java            |  3 +--
 .../systemtests/ILogMonitoringStopCondition.java  |  3 +--
 .../systemtests/JavaDropboxSystemTest.java        |  3 +--
 .../systemtests/JsonDssServiceRpcGenericTest.java |  3 +--
 .../systemtests/LinkDataSetImportSystemTest.java  |  3 +--
 .../LogMonitoringStopConditionBuilder.java        |  3 +--
 ...aterialWithLoopLikeDependenciesSystemTest.java |  3 +--
 .../datastoreserver/systemtests/MutableTest.java  |  3 +--
 .../systemtests/MutableV1Test.java                |  3 +--
 .../systemtests/MutableV2Test.java                |  3 +--
 .../systemtests/OaipmhServletTest.java            |  3 +--
 .../systemtests/OpenbisServiceFacadeTest.java     |  3 +--
 .../systemtests/OrStopCondition.java              |  3 +--
 .../systemtests/ParsedLogEntry.java               |  3 +--
 .../systemtests/PathInfoDatabaseTest.java         |  3 +--
 .../QueryApiJsonDssServiceRpcGenericTest.java     |  3 +--
 .../systemtests/QueryFacadeTest.java              |  3 +--
 .../systemtests/RegexCondition.java               |  3 +--
 .../SampleBatchImportBenchmarkSystemTest.java     |  3 +--
 .../systemtests/SearchServiceTest.java            |  3 +--
 .../systemtests/ServiceConversationTest.java      |  3 +--
 .../systemtests/SystemTestCase.java               |  3 +--
 .../VocabularyDropboxApiSystemTest.java           |  3 +--
 .../CommonAuthorizationSystemTest.java            |  3 +--
 .../authorization/ProjectAuthorizationUser.java   |  3 +--
 .../authorization/common/DataSetCodeUtil.java     |  3 +--
 .../authorization/common/DataSetTechIdUtil.java   |  3 +--
 .../authorization/common/DataSetUtil.java         |  3 +--
 .../authorization/common/DeletionUtil.java        |  3 +--
 .../common/ExperimentIdentifierUtil.java          |  3 +--
 .../authorization/common/ExternalDataUtil.java    |  3 +--
 .../common/SampleIdentifierUtil.java              |  3 +--
 .../authorization/common/SamplePermIdUtil.java    |  3 +--
 .../authorization/common/SampleTechIdUtil.java    |  3 +--
 .../authorization/common/SampleUtil.java          |  3 +--
 .../authorization/common/SampleV1Util.java        |  3 +--
 .../predicate/CommonPredicateSystemTest.java      |  3 +--
 .../CommonPredicateSystemTestAssertions.java      |  3 +--
 ...ommonPredicateSystemTestAssertionsDefault.java |  3 +--
 ...mmonPredicateSystemTestAssertionsDelegate.java |  3 +--
 ...ommonPredicateSystemTestDataSetAssertions.java |  3 +--
 ...CommonPredicateSystemTestSampleAssertions.java |  3 +--
 .../CommonPredicateSystemTestSpaceAssertions.java |  3 +--
 .../dataset/DataPEPredicateSystemTest.java        |  3 +--
 .../DataSetCodeCollectionPredicateSystemTest.java |  3 +--
 .../dataset/DataSetCodePredicateSystemTest.java   |  3 +--
 ...ataSetTechIdCollectionPredicateSystemTest.java |  3 +--
 .../dataset/DataSetTechIdPredicateSystemTest.java |  3 +--
 ...taSetUpdatesCollectionPredicateSystemTest.java |  3 +--
 ...ctionPredicateWithDataSetTechIdSystemTest.java |  3 +--
 ...edicateWithExperimentIdentifierSystemTest.java |  3 +--
 ...onPredicateWithSampleIdentifierSystemTest.java |  3 +--
 .../DataSetUpdatesPredicateSystemTest.java        |  3 +--
 ...datesPredicateWithDataSetTechIdSystemTest.java |  3 +--
 ...edicateWithExperimentIdentifierSystemTest.java |  3 +--
 ...esPredicateWithSampleIdentifierSystemTest.java |  3 +--
 .../NewDataSetsWithTypePredicateSystemTest.java   |  3 +--
 ...redicateWithContainerIdentifierSystemTest.java |  3 +--
 ...ithTypePredicateWithDataSetCodeSystemTest.java |  3 +--
 ...edicateWithExperimentIdentifierSystemTest.java |  3 +--
 ...ePredicateWithParentIdentifiersSystemTest.java |  3 +--
 ...pePredicateWithSampleIdentifierSystemTest.java |  3 +--
 .../NewExternalDataPredicateSystemTest.java       |  3 +--
 ...edicateWithExperimentIdentifierSystemTest.java |  3 +--
 ...PredicateWithParentDataSetCodesSystemTest.java |  3 +--
 ...taPredicateWithSampleIdentifierSystemTest.java |  3 +--
 ...alDataPredicateWithSamplePermIdSystemTest.java |  3 +--
 ...letionTechIdCollectionPredicateSystemTest.java |  3 +--
 ...dCollectionPredicateWithDataSetSystemTest.java |  3 +--
 ...llectionPredicateWithExperimentSystemTest.java |  3 +--
 ...IdCollectionPredicateWithSampleSystemTest.java |  3 +--
 .../RevertDeletionPredicateSystemTest.java        |  3 +--
 ...ertDeletionPredicateWithDataSetSystemTest.java |  3 +--
 ...DeletionPredicateWithExperimentSystemTest.java |  3 +--
 ...vertDeletionPredicateWithSampleSystemTest.java |  3 +--
 .../deletion/V3DeletionIdPredicateSystemTest.java |  3 +--
 ...3DeletionIdPredicateWithDataSetSystemTest.java |  3 +--
 ...letionIdPredicateWithExperimentSystemTest.java |  3 +--
 ...V3DeletionIdPredicateWithSampleSystemTest.java |  3 +--
 .../AtomicOperationsPredicateSystemTest.java      |  3 +--
 ...redicateWithDataSetRegistrationSystemTest.java |  3 +--
 ...tionsPredicateWithDataSetUpdateSystemTest.java |  3 +--
 ...icateWithExperimentRegistrationSystemTest.java |  3 +--
 ...nsPredicateWithExperimentUpdateSystemTest.java |  3 +--
 ...redicateWithProjectRegistrationSystemTest.java |  3 +--
 ...tionsPredicateWithProjectUpdateSystemTest.java |  3 +--
 ...PredicateWithSampleRegistrationSystemTest.java |  3 +--
 ...ationsPredicateWithSampleUpdateSystemTest.java |  3 +--
 ...BasicEntityDescriptionPredicateSystemTest.java |  3 +--
 ...DescriptionPredicateWithDataSetSystemTest.java |  3 +--
 ...criptionPredicateWithExperimentSystemTest.java |  3 +--
 ...yDescriptionPredicateWithSampleSystemTest.java |  3 +--
 ...xperimentAugmentedCodePredicateSystemTest.java |  3 +--
 .../ExperimentIdPredicateSystemTest.java          |  3 +--
 ...entIdPredicateWithAugmentedCodeSystemTest.java |  3 +--
 ...ExperimentIdPredicateWithPermIdSystemTest.java |  3 +--
 ...ExperimentIdPredicateWithTechIdSystemTest.java |  3 +--
 .../ExperimentListPredicateSystemTest.java        |  3 +--
 .../ExperimentPEOrNullPredicateSystemTest.java    |  3 +--
 .../ExperimentPEPredicateSystemTest.java          |  3 +--
 .../ExperimentPermIdPredicateSystemTest.java      |  3 +--
 ...rimentTechIdCollectionPredicateSystemTest.java |  3 +--
 .../ExperimentTechIdPredicateSystemTest.java      |  3 +--
 .../ExperimentUpdatesPredicateSystemTest.java     |  3 +--
 ...esPredicateWithExperimentTechIdSystemTest.java |  3 +--
 ...sPredicateWithProjectIdentifierSystemTest.java |  3 +--
 .../NewExperimentPredicateSystemTest.java         |  3 +--
 ...NewExperimentsWithTypePredicateSystemTest.java |  3 +--
 ...tedExperimentsWithTypePredicateSystemTest.java |  3 +--
 .../project/NewProjectPredicateSystemTest.java    |  3 +--
 .../ProjectAugmentedCodePredicateSystemTest.java  |  3 +--
 ...rojectIdPredicateWithIdentifierSystemTest.java |  3 +--
 .../ProjectIdPredicateWithPermIdSystemTest.java   |  3 +--
 .../ProjectIdPredicateWithTechIdSystemTest.java   |  3 +--
 ...dentifierExistingSpacePredicateSystemTest.java |  3 +--
 .../ProjectIdentifierPredicateSystemTest.java     |  3 +--
 .../project/ProjectPEPredicateSystemTest.java     |  3 +--
 .../project/ProjectPermIdPredicateSystemTest.java |  3 +--
 .../ProjectPermIdStringPredicateSystemTest.java   |  3 +--
 .../project/ProjectPredicateSystemTest.java       |  3 +--
 ...rojectTechIdCollectionPredicateSystemTest.java |  3 +--
 .../project/ProjectTechIdPredicateSystemTest.java |  3 +--
 ...tUpdatesPredicateWithIdentifierSystemTest.java |  3 +--
 ...ojectUpdatesPredicateWithPermIdSystemTest.java |  3 +--
 ...ojectUpdatesPredicateWithTechIdSystemTest.java |  3 +--
 ...istingSampleIdentifierPredicateSystemTest.java |  3 +--
 .../ListSampleCriteriaPredicateSystemTest.java    |  3 +--
 ...ampleCriteriaPredicateWithChildSystemTest.java |  3 +--
 ...leCriteriaPredicateWithChildrenSystemTest.java |  3 +--
 ...eCriteriaPredicateWithContainerSystemTest.java |  3 +--
 ...CriteriaPredicateWithContainersSystemTest.java |  3 +--
 ...CriteriaPredicateWithExperimentSystemTest.java |  3 +--
 ...mpleCriteriaPredicateWithParentSystemTest.java |  3 +--
 ...mpleCriteriaPredicateWithSampleSystemTest.java |  3 +--
 ...ampleCriteriaPredicateWithSpaceSystemTest.java |  3 +--
 .../ListSamplesByPropertyPredicateSystemTest.java |  3 +--
 .../sample/NewSamplePredicateSystemTest.java      |  3 +--
 ...redicateWithContainerIdentifierSystemTest.java |  3 +--
 ...edicateWithExperimentIdentifierSystemTest.java |  3 +--
 ...lePredicateWithParentIdentifierSystemTest.java |  3 +--
 ...ePredicateWithProjectIdentifierSystemTest.java |  3 +--
 ...lePredicateWithSampleIdentifierSystemTest.java |  3 +--
 .../NewSamplePredicateWithSampleSystemTest.java   |  3 +--
 ...redicateWithContainerIdentifierSystemTest.java |  3 +--
 ...edicateWithExperimentIdentifierSystemTest.java |  3 +--
 ...pePredicateWithParentIdentifierSystemTest.java |  3 +--
 ...ePredicateWithProjectIdentifierSystemTest.java |  3 +--
 ...pePredicateWithSampleIdentifierSystemTest.java |  3 +--
 .../SampleAugmentedCodePredicateSystemTest.java   |  3 +--
 .../sample/SampleIdPredicateSystemTest.java       |  3 +--
 ...IdPredicateWithSampleIdentifierSystemTest.java |  3 +--
 ...mpleIdPredicateWithSamplePermIdSystemTest.java |  3 +--
 ...mpleIdPredicateWithSampleTechIdSystemTest.java |  3 +--
 ...leIdentifierCollectionPredicateSystemTest.java |  3 +--
 .../SampleIdentifierPredicateSystemTest.java      |  3 +--
 .../sample/SampleListPredicateSystemTest.java     |  3 +--
 .../sample/SamplePEOrNullPredicateSystemTest.java |  3 +--
 .../sample/SamplePEPredicateSystemTest.java       |  3 +--
 .../sample/SamplePermIdPredicateSystemTest.java   |  3 +--
 .../SamplePermIdStringPredicateSystemTest.java    |  3 +--
 .../sample/SamplePredicateSystemTest.java         |  3 +--
 ...SampleTechIdCollectionPredicateSystemTest.java |  3 +--
 ...hIdCollectionReadWritePredicateSystemTest.java |  3 +--
 .../sample/SampleTechIdPredicateSystemTest.java   |  3 +--
 .../SampleTechIdReadWritePredicateSystemTest.java |  3 +--
 ...redicateWithContainerIdentifierSystemTest.java |  3 +--
 ...edicateWithExperimentIdentifierSystemTest.java |  3 +--
 ...nPredicateWithProjectIdentifierSystemTest.java |  3 +--
 ...ectionPredicateWithSampleTechIdSystemTest.java |  3 +--
 .../sample/SampleUpdatesPredicateSystemTest.java  |  3 +--
 ...redicateWithContainerIdentifierSystemTest.java |  3 +--
 ...edicateWithExperimentIdentifierSystemTest.java |  3 +--
 ...sPredicateWithProjectIdentifierSystemTest.java |  3 +--
 ...ampleUpdatesPredicateWithSampleSystemTest.java |  3 +--
 ...pdatesPredicateWithSampleTechIdSystemTest.java |  3 +--
 ...aceIdentifierOrProjectPredicateSystemTest.java |  3 +--
 ...xistingSpaceIdentifierPredicateSystemTest.java |  3 +--
 .../space/SpaceIdentifierPredicateSystemTest.java |  3 +--
 .../validator/CommonValidatorSystemTest.java      |  3 +--
 .../CommonValidatorSystemTestAssertions.java      |  3 +--
 ...ommonValidatorSystemTestAssertionsDefault.java |  3 +--
 ...mmonValidatorSystemTestAssertionsDelegate.java |  3 +--
 ...ommonValidatorSystemTestDataSetAssertions.java |  3 +--
 ...mmonValidatorSystemTestMaterialAssertions.java |  3 +--
 ...CommonValidatorSystemTestSampleAssertions.java |  3 +--
 .../CommonValidatorSystemTestSpaceAssertions.java |  3 +--
 ...mentOrSampleIdentifierValidatorSystemTest.java |  3 +--
 ...mentOrSampleIdentifierValidatorSystemTest.java |  3 +--
 .../dataset/ExternalDataValidatorSystemTest.java  |  3 +--
 .../deletion/DeletionValidatorSystemTest.java     |  3 +--
 .../DeletionValidatorWithDataSetSystemTest.java   |  3 +--
 ...DeletionValidatorWithExperimentSystemTest.java |  3 +--
 .../DeletionValidatorWithSampleSystemTest.java    |  3 +--
 .../entity/EntityHistoryValidatorSystemTest.java  |  3 +--
 ...tityHistoryValidatorWithDataSetSystemTest.java |  3 +--
 ...yHistoryValidatorWithExperimentSystemTest.java |  3 +--
 ...tityHistoryValidatorWithProjectSystemTest.java |  3 +--
 ...ntityHistoryValidatorWithSampleSystemTest.java |  3 +--
 ...EntityHistoryValidatorWithSpaceSystemTest.java |  3 +--
 .../entity/MatchingEntityValidatorSystemTest.java |  3 +--
 ...chingEntityValidatorWithDataSetSystemTest.java |  3 +--
 ...ngEntityValidatorWithExperimentSystemTest.java |  3 +--
 ...hingEntityValidatorWithMaterialSystemTest.java |  3 +--
 ...tchingEntityValidatorWithSampleSystemTest.java |  3 +--
 .../ExperimentByIdentiferValidatorSystemTest.java |  3 +--
 .../experiment/ExperimentValidatorSystemTest.java |  3 +--
 .../ProjectByIdentiferValidatorSystemTest.java    |  3 +--
 .../project/ProjectValidatorSystemTest.java       |  3 +--
 .../SampleByIdentiferValidatorSystemTest.java     |  3 +--
 .../sample/SampleValidatorSystemTest.java         |  3 +--
 .../SimpleSpaceOrProjectValidatorSystemTest.java  |  3 +--
 .../space/SimpleSpaceValidatorSystemTest.java     |  3 +--
 .../validator/space/SpaceValidatorSystemTest.java |  3 +--
 .../batch/DataSetArchiveVerifierTest.java         |  3 +--
 .../verifier/ZipFileIntegrityVerifierTest.java    |  3 +--
 .../dss/client/admin/MoveDataSetsCommandTest.java |  3 +--
 .../client/admin/ShareManagerApplicationTest.java |  3 +--
 .../dss/client/api/cli/CommandGetTest.java        |  3 +--
 .../openbis/dss/client/api/cli/CommandLsTest.java |  3 +--
 .../dss/client/api/cli/CommandPutTest.java        |  3 +--
 .../dss/client/api/cli/DataSetArgumentsTest.java  |  3 +--
 .../dss/client/api/cli/DssCommandFactoryTest.java |  3 +--
 .../dss/client/api/cli/GlobalArgumentsTest.java   |  3 +--
 .../dss/client/api/v1/impl/DssComponentTest.java  |  3 +--
 .../api/v1/impl/DssComponentTestClient.java       |  3 +--
 .../api/v1/impl/OpenbisServiceFacadeTest.java     |  3 +--
 .../dss/generic/server/AutoResolveUtilsTest.java  |  3 +--
 .../dss/generic/server/ConfigParametersTest.java  |  3 +--
 .../dss/generic/server/DataStoreServiceTest.java  |  3 +--
 .../DatabaseBasedDataSetPathInfoProviderTest.java |  3 +--
 .../server/DatasetDownloadServletTest.java        |  3 +--
 .../dss/generic/server/DeletionCommandTest.java   |  3 +--
 .../dss/generic/server/DssServiceRpcV1Test.java   |  3 +--
 .../server/EncapsulatedOpenBISServiceTest.java    |  3 +--
 .../FolderFileSizesReportGeneratorTest.java       |  3 +--
 .../IdentifiedStreamHandlingServletTest.java      |  3 +--
 ...eyBasedDataSetCommandExecutorProviderTest.java |  3 +--
 .../server/ProcessDatasetsCommandTest.java        |  3 +--
 .../dss/generic/server/ShareIdManagerTest.java    |  3 +--
 .../dss/generic/server/StreamRepositoryTest.java  |  3 +--
 .../dss/generic/server/UploadingCommandTest.java  |  3 +--
 .../generic/server/ZipDataSetPackagerTest.java    |  3 +--
 .../server/api/v1/DssServiceRpcGenericTest.java   |  3 +--
 .../BackupDatabaseDescriptionGeneratorTest.java   |  3 +--
 .../openbis/dss/generic/server/ftp/CacheTest.java |  3 +--
 .../generic/server/ftp/DSSFileSystemViewTest.java |  3 +--
 .../generic/server/ftp/ResolverConfigBuilder.java |  3 +--
 .../TemplateBasedDataSetResourceResolverTest.java |  3 +--
 .../OpenBISAuthenticationInterceptorTest.java     |  3 +--
 .../server/plugins/jython/EmailSenderTest.java    |  3 +--
 ...asedAggregationServiceReportingPluginTest.java |  3 +--
 .../jython/JythonBasedProcessingPluginTest.java   |  3 +--
 .../jython/JythonBasedReportingPluginTest.java    |  3 +--
 .../server/plugins/jython/MailServiceTest.java    |  3 +--
 .../AbstractArchiverProcessingPluginTest.java     |  3 +--
 .../standard/AbstractArchiverTestCase.java        |  3 +--
 .../AbstractFileTableReportingPluginTest.java     |  3 +--
 .../standard/AbstractPackageArchiverTest.java     |  3 +--
 .../standard/ArchivingAggregationServiceTest.java |  3 +--
 ...nfoDBConsistencyCheckProcessingPluginTest.java |  3 +--
 .../standard/DataSetCopierForUsersTest.java       |  3 +--
 .../plugins/standard/DataSetCopierTest.java       |  3 +--
 .../DataSetFileOperationsManagerTest.java         |  3 +--
 .../standard/ExampleAggregationServicePlugin.java |  3 +--
 .../ExampleDbModifyingAggregationService.java     |  3 +--
 .../MergedColumnDataReportingPluginTest.java      |  3 +--
 .../server/plugins/standard/MockContent.java      |  3 +--
 .../standard/MockDataSetDirectoryProvider.java    |  3 +--
 .../generic/server/plugins/standard/MockNode.java |  3 +--
 .../plugins/standard/RsyncArchiverTest.java       |  3 +--
 .../standard/TSVViewReportingPluginTest.java      |  3 +--
 .../server/plugins/standard/TarArchiverTest.java  |  3 +--
 .../standard/TarBasedPathInfoProviderTest.java    |  3 +--
 .../server/plugins/standard/ZipArchiverTest.java  |  3 +--
 .../CleanUpUnarchivingScratchShareTaskTest.java   |  3 +--
 .../standard/archiver/FileDeleterTest.java        |  3 +--
 .../plugins/standard/archiver/MockCleaner.java    |  3 +--
 .../MockMultiDataSetArchiverDBTransaction.java    | 15 +++++++++++++++
 .../archiver/MultiDataSetArchiveCleanerTest.java  |  3 +--
 .../archiver/MultiDataSetArchiverTest.java        |  3 +--
 .../MultiDataSetArchivingFinalizerTest.java       |  3 +--
 .../MultiDataSetDeletionMaintenanceTaskTest.java  | 15 +++++++++++++++
 ...ultiDataSetUnarchivingMaintenanceTaskTest.java |  3 +--
 ...TimeProviderWithMessageChannelInteraction.java |  3 +--
 .../tasks/IterativeTableModelBuilderTest.java     |  3 +--
 .../plugins/tasks/PluginTaskParametersTest.java   |  3 +--
 .../shared/AbstractIShareFinderTestCase.java      |  3 +--
 .../generic/shared/AbstractShareFinderTest.java   |  3 +--
 .../shared/DataSetTypeBasedShareFinderTest.java   |  3 +--
 .../shared/ExperimentBasedShareFinderTest.java    |  3 +--
 .../shared/HierarchicalContentProviderTest.java   |  3 +--
 .../shared/IEncapsulatedOpenBISServiceTest.java   |  3 +--
 .../IdentifierAttributeMappingManagerTest.java    |  3 +--
 .../IncomingShareIdProviderTestWrapper.java       |  3 +--
 .../shared/MappingBasedShareFinderTest.java       |  3 +--
 .../dss/generic/shared/ProxyShareIdManager.java   |  3 +--
 .../shared/ServiceProviderTestWrapper.java        |  3 +--
 .../dss/generic/shared/SimpleShareFinderTest.java |  3 +--
 .../shared/SpeedOptimizedShareFinderTest.java     |  3 +--
 .../generic/shared/StandardShareFinderTest.java   |  3 +--
 .../generic/shared/api/v1/DataSetFileDTOTest.java |  3 +--
 .../shared/api/v1/FileInfoDssBuilderTest.java     |  3 +--
 .../generic/shared/api/v1/FileInfoDssDTOTest.java |  3 +--
 .../v1/validation/ValidationScriptRunnerTest.java |  3 +--
 ...AbstractRemoteHierarchicalContentTestCase.java |  3 +--
 .../generic/shared/content/ContentCacheTest.java  |  3 +--
 .../content/DelayedPersistenceManagerTest.java    |  3 +--
 ...hInfoProviderBasedHierarchicalContentTest.java |  3 +--
 ...oteHierarchicalContentNodeMultiThreadTest.java |  3 +--
 .../RemoteHierarchicalContentNodeTest.java        |  3 +--
 .../content/RemoteHierarchicalContentTest.java    |  3 +--
 .../dss/generic/shared/dto/PathInfoTest.java      |  3 +--
 .../generic/shared/utils/CodeAndLabelTest.java    |  3 +--
 .../shared/utils/ImageUtilReaderPoolTest.java     |  3 +--
 .../dss/generic/shared/utils/ImageUtilTest.java   |  3 +--
 .../shared/utils/MockFreeSpaceProvider.java       |  3 +--
 .../dss/generic/shared/utils/PluginUtilTest.java  |  3 +--
 ...stgresPlusFileSystemFreeSpaceProviderTest.java |  3 +--
 .../shared/utils/SegmentedStoreUtilsTest.java     |  3 +--
 .../generic/shared/utils/ShareFactoryTest.java    |  3 +--
 .../shared/utils/SimpleFileContentProvider.java   |  3 +--
 .../dss/generic/shared/utils/ThumbnailTiming.java |  3 +--
 1485 files changed, 2205 insertions(+), 2854 deletions(-)

diff --git a/server-original-data-store/source/java/ch/ethz/sis/DOCXBuilder.java b/server-original-data-store/source/java/ch/ethz/sis/DOCXBuilder.java
index 6c0f4185b58..ff9ed2ee118 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/DOCXBuilder.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/DOCXBuilder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2021 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.ethz.sis;
 
 import java.io.ByteArrayOutputStream;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/DataSetRegistrationCleanUpTask.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/DataSetRegistrationCleanUpTask.java
index 386e198294d..2531cebfaed 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/DataSetRegistrationCleanUpTask.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/DataSetRegistrationCleanUpTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 ETH Zuerich, SIS
+ * Copyright ETH 2022 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/PreStagingCleanUpMaintenanceTask.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/PreStagingCleanUpMaintenanceTask.java
index a1a0e0efea3..895ee380582 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/PreStagingCleanUpMaintenanceTask.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/PreStagingCleanUpMaintenanceTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 ETH Zuerich, SIS
+ * Copyright ETH 2020 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/SessionWorkspaceCleanUpMaintenanceTask.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/SessionWorkspaceCleanUpMaintenanceTask.java
index c159299ae4e..c5369294e94 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/SessionWorkspaceCleanUpMaintenanceTask.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/SessionWorkspaceCleanUpMaintenanceTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/EntityRetriever.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/EntityRetriever.java
index 0ecb7919b33..55366a1d9f5 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/EntityRetriever.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/EntityRetriever.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, SIS
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/MasterDataExtractor.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/MasterDataExtractor.java
index c37201a82b7..a9fa4591ecf 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/MasterDataExtractor.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/MasterDataExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.common;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.BasicConstant.INTERNAL_NAMESPACE_PREFIX;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/ServiceFinderUtils.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/ServiceFinderUtils.java
index 2bd222c8a00..a22b47f4115 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/ServiceFinderUtils.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/ServiceFinderUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, SIS
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.common;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/SkinnyEntityRetriever.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/SkinnyEntityRetriever.java
index a3f1ededffb..b550c4dd5b0 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/SkinnyEntityRetriever.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/SkinnyEntityRetriever.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, SIS
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/SyncEntityKind.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/SyncEntityKind.java
index e51146daaf9..6daace54773 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/SyncEntityKind.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/SyncEntityKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.common;
 
 /**
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/Edge.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/Edge.java
index 915b94020fd..56820d8247a 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/Edge.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/Edge.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/EdgeNodePair.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/EdgeNodePair.java
index 663d9bf12b9..3b47d24f263 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/EdgeNodePair.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/EdgeNodePair.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/EntityGraph.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/EntityGraph.java
index 2d773b9483b..df87072da33 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/EntityGraph.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/EntityGraph.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/IEntityRetriever.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/IEntityRetriever.java
index 0e78490e82e..84a6344c08a 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/IEntityRetriever.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/IEntityRetriever.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.common.entitygraph;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/INode.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/INode.java
index d3f335fb986..04e7153ec33 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/INode.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/INode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.common.entitygraph;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/Node.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/Node.java
index 557be0af64c..322d362fe8b 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/Node.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/Node.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/NodeIdentifier.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/NodeIdentifier.java
index da8907dbca5..99ab6634845 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/NodeIdentifier.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/NodeIdentifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.common.entitygraph;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.DataSet;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/SkinnyNode.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/SkinnyNode.java
index 445f62a91a3..1b014b1ad25 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/SkinnyNode.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/SkinnyNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.common.entitygraph;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/AbstractEntityDeliverer.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/AbstractEntityDeliverer.java
index 8066571a7bb..dd2d2e9bb2d 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/AbstractEntityDeliverer.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/AbstractEntityDeliverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.datasource;
 
 import java.util.Collections;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/AbstractEntityWithPermIdDeliverer.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/AbstractEntityWithPermIdDeliverer.java
index cf371857379..3ce5626f5eb 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/AbstractEntityWithPermIdDeliverer.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/AbstractEntityWithPermIdDeliverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.datasource;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/ConnectionsBuilder.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/ConnectionsBuilder.java
index 7c29c736d39..f9e0b5e8f6b 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/ConnectionsBuilder.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/ConnectionsBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.datasource;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/DataSetDeliverer.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/DataSetDeliverer.java
index cb984f2361b..11716db9947 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/DataSetDeliverer.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/DataSetDeliverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.datasource;
 
 import java.util.Collection;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/DataSourceRequestHandler.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/DataSourceRequestHandler.java
index a94babbe30c..23b7b071a20 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/DataSourceRequestHandler.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/DataSourceRequestHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.datasource;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/DataSourceUtils.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/DataSourceUtils.java
index 78b50ce66ff..2d713bc4e61 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/DataSourceUtils.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/DataSourceUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.datasource;
 
 import java.text.SimpleDateFormat;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/Deliverers.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/Deliverers.java
index 56fe763d63e..9d8e6a447f4 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/Deliverers.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/Deliverers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.datasource;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/DeliveryContext.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/DeliveryContext.java
index 9f57249767d..111fd37ffbc 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/DeliveryContext.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/DeliveryContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.datasource;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/DeliveryExecutionContext.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/DeliveryExecutionContext.java
index 5f3b0530edb..6c14af817d2 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/DeliveryExecutionContext.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/DeliveryExecutionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.datasource;
 
 import java.util.Date;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/ExperimentDeliverer.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/ExperimentDeliverer.java
index fbc9903d9b5..4083643e117 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/ExperimentDeliverer.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/ExperimentDeliverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.datasource;
 
 import java.util.Collection;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/FileDeliverer.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/FileDeliverer.java
index bb99a0980f9..dcbc14d597c 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/FileDeliverer.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/FileDeliverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.datasource;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/IDeliverer.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/IDeliverer.java
index 3ffa75cacaa..e06430b5011 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/IDeliverer.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/IDeliverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.datasource;
 
 import javax.xml.stream.XMLStreamException;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/MasterDataDeliverer.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/MasterDataDeliverer.java
index 9640f8d5567..5c3201bc203 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/MasterDataDeliverer.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/MasterDataDeliverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.datasource;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.BasicConstant.INTERNAL_NAMESPACE_PREFIX;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/MaterialDeliverer.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/MaterialDeliverer.java
index 51ca2d0054f..37e34bd1df2 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/MaterialDeliverer.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/MaterialDeliverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.datasource;
 
 import java.util.Collection;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/ProjectDeliverer.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/ProjectDeliverer.java
index c9835cf0e9f..ddc2c59f6a1 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/ProjectDeliverer.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/ProjectDeliverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.datasource;
 
 import java.util.Collection;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/ResourceSyncRequestHandler.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/ResourceSyncRequestHandler.java
index e9061c66167..53fb39340e6 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/ResourceSyncRequestHandler.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/ResourceSyncRequestHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, SIS
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/SampleDeliverer.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/SampleDeliverer.java
index d9d0afba767..0e3a0762c62 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/SampleDeliverer.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/SampleDeliverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.datasource;
 
 import java.util.Collection;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/SpaceDeliverer.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/SpaceDeliverer.java
index 29c3c07001f..d0171a9cefc 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/SpaceDeliverer.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/SpaceDeliverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.datasource;
 
 import java.util.Collection;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/HarvesterMaintenanceTask.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/HarvesterMaintenanceTask.java
index fb171fee715..7edb94265e4 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/HarvesterMaintenanceTask.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/HarvesterMaintenanceTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/config/BasicAuthCredentials.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/config/BasicAuthCredentials.java
index 0fd30e7beda..bd7f52c1a23 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/config/BasicAuthCredentials.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/config/BasicAuthCredentials.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.config;
 
 /**
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/config/ConfigReader.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/config/ConfigReader.java
index a619c19acc8..d2d2580d253 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/config/ConfigReader.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/config/ConfigReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.config;
 
 /**
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/config/ParallelizedExecutionPreferences.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/config/ParallelizedExecutionPreferences.java
index 5982b517731..d9371b3ed94 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/config/ParallelizedExecutionPreferences.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/config/ParallelizedExecutionPreferences.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.config;
 
 /**
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/config/SyncConfig.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/config/SyncConfig.java
index 4c121d48c7d..88c8d182013 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/config/SyncConfig.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/config/SyncConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.config;
 
 import java.lang.reflect.Field;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/config/SynchronizationConfigReader.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/config/SynchronizationConfigReader.java
index 33347d81183..9f11a563967 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/config/SynchronizationConfigReader.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/config/SynchronizationConfigReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.config;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/AbstractTimestampsAndUserHolder.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/AbstractTimestampsAndUserHolder.java
index 278d2c7c10c..8d4edb6b0d6 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/AbstractTimestampsAndUserHolder.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/AbstractTimestampsAndUserHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer;
 
 import java.util.Date;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/Connection.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/Connection.java
index 5a8bd1b4238..cbc75525110 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/Connection.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/Connection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer;
 
 class Connection
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/ConnectionType.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/ConnectionType.java
index b96a6257f05..41631c3f7e9 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/ConnectionType.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/ConnectionType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer;
 
 enum ConnectionType
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/EntitySynchronizer.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/EntitySynchronizer.java
index 0141551bf93..8a2b303152f 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/EntitySynchronizer.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/EntitySynchronizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/FrozenFlags.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/FrozenFlags.java
index 5a2be604bc5..931c7cd4750 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/FrozenFlags.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/FrozenFlags.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer;
 
 /**
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/FrozenForType.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/FrozenForType.java
index 71bdff6eea0..b124dcfc3b8 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/FrozenForType.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/FrozenForType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer;
 
 import java.lang.reflect.Field;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IHarvesterQuery.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IHarvesterQuery.java
index 48c576f60ad..e664a95467b 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IHarvesterQuery.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IHarvesterQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/ISynchronizerFacade.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/ISynchronizerFacade.java
index 2cada311965..b2cc64f44b4 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/ISynchronizerFacade.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/ISynchronizerFacade.java
@@ -1,4 +1,5 @@
-/* Copyright 2016 ETH Zuerich, SIS
+/*
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IncomingDataSet.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IncomingDataSet.java
index 3839625ddfc..634b994d333 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IncomingDataSet.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IncomingDataSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer;
 
 import java.io.Serializable;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IncomingEntity.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IncomingEntity.java
index 0befb8b0dc9..2bf4a3bc915 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IncomingEntity.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IncomingEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IncomingExperiment.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IncomingExperiment.java
index 4956fb84008..8e5858e6a6d 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IncomingExperiment.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IncomingExperiment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer;
 
 import java.util.Date;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IncomingMaterial.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IncomingMaterial.java
index ece16fa5fa5..98ca775337e 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IncomingMaterial.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IncomingMaterial.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer;
 
 import java.util.Date;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IncomingProject.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IncomingProject.java
index 6d3ac427f52..1022f4456f9 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IncomingProject.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IncomingProject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer;
 
 import java.util.Date;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IncomingSample.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IncomingSample.java
index 7356f78c667..42ff71c2b9f 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IncomingSample.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IncomingSample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer;
 
 import java.util.Date;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IncomingSpace.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IncomingSpace.java
index 631740bccd2..75b58084de9 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IncomingSpace.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/IncomingSpace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer;
 
 import java.util.Date;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/MasterData.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/MasterData.java
index 7e8f9b5517b..d573c47250e 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/MasterData.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/MasterData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer;
 
 import java.util.HashMap;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/MasterDataParser.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/MasterDataParser.java
index 9c5dd06ed3e..6bad8633e7a 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/MasterDataParser.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/MasterDataParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/MasterDataSynchronizer.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/MasterDataSynchronizer.java
index 691b90c4ba2..d679105231b 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/MasterDataSynchronizer.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/MasterDataSynchronizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer;
 
 import java.io.PrintWriter;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/MaterialTypeRecord.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/MaterialTypeRecord.java
index 5bfc4625f94..d62462ef30e 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/MaterialTypeRecord.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/MaterialTypeRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer;
 
 /**
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/NameMapper.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/NameMapper.java
index 301a2932d36..ee5c4f96a2b 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/NameMapper.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/NameMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 ETH Zuerich, SIS
+ * Copyright ETH 2020 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer;
 
 import java.util.HashMap;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/PersonRecord.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/PersonRecord.java
index 96e92bccf64..9016a7b07ca 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/PersonRecord.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/PersonRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer;
 
 /**
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/RegistrationDTO.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/RegistrationDTO.java
index 88a859af58f..ed962ac7eed 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/RegistrationDTO.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/RegistrationDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer;
 
 import java.util.Date;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/ResourceListParser.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/ResourceListParser.java
index 9e4ea3517ea..69a96456f2b 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/ResourceListParser.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/ResourceListParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/ResourceListParserData.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/ResourceListParserData.java
index 1d21e8d303a..182b088183b 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/ResourceListParserData.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/ResourceListParserData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/SynchronizationContext.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/SynchronizationContext.java
index 4122ad9ae67..9b046970ebb 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/SynchronizationContext.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/SynchronizationContext.java
@@ -1,19 +1,18 @@
 /*
- * Copyright 2018 ETH Zuerich;private SIS
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
- * Licensed under the Apache License;private Version 2.0 (the "License");
+ * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing;private software
- * distributed under the License is distributed on an "AS IS" BASIS;private final
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND;private either express or implied.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/SynchronizerFacade.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/SynchronizerFacade.java
index dbec28bf4dd..28af89ceeac 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/SynchronizerFacade.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/SynchronizerFacade.java
@@ -1,4 +1,5 @@
-/* Copyright 2016 ETH Zuerich, SIS
+/*
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/datasourceconnector/DataSourceConnector.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/datasourceconnector/DataSourceConnector.java
index c3e433ef29c..29385fbe9b0 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/datasourceconnector/DataSourceConnector.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/datasourceconnector/DataSourceConnector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer.datasourceconnector;
 
 import java.io.ByteArrayInputStream;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/datasourceconnector/IDataSourceConnector.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/datasourceconnector/IDataSourceConnector.java
index 3b3ac1f4a78..8f4b3f6cb6a 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/datasourceconnector/IDataSourceConnector.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/datasourceconnector/IDataSourceConnector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer.datasourceconnector;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/parallelizedExecutor/AttachmentSynchronizationSummary.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/parallelizedExecutor/AttachmentSynchronizationSummary.java
index 2c745ca4f1b..cf846f33772 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/parallelizedExecutor/AttachmentSynchronizationSummary.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/parallelizedExecutor/AttachmentSynchronizationSummary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer.parallelizedExecutor;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/parallelizedExecutor/AttachmentsSynchronizer.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/parallelizedExecutor/AttachmentsSynchronizer.java
index 91bd0ac2cbb..dc658251600 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/parallelizedExecutor/AttachmentsSynchronizer.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/parallelizedExecutor/AttachmentsSynchronizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer.parallelizedExecutor;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/parallelizedExecutor/DataSetRegistrationIngestionService.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/parallelizedExecutor/DataSetRegistrationIngestionService.java
index 46b4764eccc..082b296e69e 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/parallelizedExecutor/DataSetRegistrationIngestionService.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/parallelizedExecutor/DataSetRegistrationIngestionService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer.parallelizedExecutor;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/parallelizedExecutor/DataSetRegistrationTaskExecutor.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/parallelizedExecutor/DataSetRegistrationTaskExecutor.java
index a933b974c6c..25dfb844e4d 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/parallelizedExecutor/DataSetRegistrationTaskExecutor.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/parallelizedExecutor/DataSetRegistrationTaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer.parallelizedExecutor;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/parallelizedExecutor/DataSetSynchronizationSummary.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/parallelizedExecutor/DataSetSynchronizationSummary.java
index 9eb00d3d546..d3aea2fa7fb 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/parallelizedExecutor/DataSetSynchronizationSummary.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/parallelizedExecutor/DataSetSynchronizationSummary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer.parallelizedExecutor;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/translator/DefaultNameTranslator.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/translator/DefaultNameTranslator.java
index 7a260c709a3..43e3416432a 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/translator/DefaultNameTranslator.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/translator/DefaultNameTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer.translator;
 
 /**
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/translator/INameTranslator.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/translator/INameTranslator.java
index fbcc48d4bf2..55c4ae0f668 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/translator/INameTranslator.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/translator/INameTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer.translator;
 /**
  * 
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/translator/PrefixBasedNameTranslator.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/translator/PrefixBasedNameTranslator.java
index f877d27c9f0..d405a3dbd26 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/translator/PrefixBasedNameTranslator.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/translator/PrefixBasedNameTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer.translator;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.BasicConstant.INTERNAL_NAMESPACE_PREFIX;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/util/DSPropertyUtils.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/util/DSPropertyUtils.java
index e156fa7e222..cf94f75125b 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/util/DSPropertyUtils.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/util/DSPropertyUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer.util;
 
 import java.text.DateFormat;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/util/Monitor.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/util/Monitor.java
index 1622b730510..303d9b3a545 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/util/Monitor.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/util/Monitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer.util;
 
 import java.util.concurrent.TimeUnit;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/util/ServiceUtils.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/util/ServiceUtils.java
index 073f40ed6d2..9c0b5a00235 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/util/ServiceUtils.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/util/ServiceUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer.util;
 
 import org.apache.commons.lang3.time.DateUtils;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/util/SummaryUtils.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/util/SummaryUtils.java
index 660b1ed6ae4..66c4713922d 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/util/SummaryUtils.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/util/SummaryUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 ETH Zuerich, SIS
+ * Copyright ETH 2020 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer.util;
 
 import java.util.Collection;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/util/V3Facade.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/util/V3Facade.java
index 05b965ee45d..d2b03bd5a40 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/util/V3Facade.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/util/V3Facade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer.util;
 
 import java.io.InputStream;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/Constants.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/Constants.java
index 3f67c5bd0b3..c8481919226 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/Constants.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/Constants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dssapi.v3;
 
 /**
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApi.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApi.java
index 7d238e09f74..9e7bf792c89 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApi.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2015 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApiJson.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApiJson.java
index 376a85acd3b..8bf73ab5af2 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApiJson.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApiJson.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dssapi.v3;
 
 import java.io.InputStream;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApiJsonServer.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApiJsonServer.java
index c6551a3ba5b..9f894ef29bd 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApiJsonServer.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApiJsonServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dssapi.v3;
 
 import java.io.IOException;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApiLogger.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApiLogger.java
index 55d1754ae1e..6837e347e23 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApiLogger.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApiLogger.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2015 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.ethz.sis.openbis.generic.server.dssapi.v3;
 
 import java.io.InputStream;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApiPersonalAccessTokenInvocationHandler.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApiPersonalAccessTokenInvocationHandler.java
index 793a56c96dd..a43281250cc 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApiPersonalAccessTokenInvocationHandler.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApiPersonalAccessTokenInvocationHandler.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2022 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.ethz.sis.openbis.generic.server.dssapi.v3;
 
 import java.io.InputStream;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApiServer.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApiServer.java
index 574b41724f4..13d7b644673 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApiServer.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/DataStoreServerApiServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dssapi.v3;
 
 import java.io.IOException;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/FileTransferServerServlet.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/FileTransferServerServlet.java
index 0587e41c4c8..2796cae054a 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/FileTransferServerServlet.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/FileTransferServerServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dssapi.v3;
 
 import java.io.ByteArrayInputStream;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/Log4jBaseFileTransferLogger.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/Log4jBaseFileTransferLogger.java
index aec1b2c0c27..7a5450e2cb5 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/Log4jBaseFileTransferLogger.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/Log4jBaseFileTransferLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dssapi.v3;
 
 import org.apache.log4j.Level;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/Utils.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/Utils.java
index 7f191bd2fbd..42f102f5c6a 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/Utils.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/Utils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 ETH Zuerich, SIS
+ * Copyright ETH 2020 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dssapi.v3;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id.DataSetPermId;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/download/DataSetFileDownloadInputStream.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/download/DataSetFileDownloadInputStream.java
index b17239f24ee..8aa99b91bed 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/download/DataSetFileDownloadInputStream.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/download/DataSetFileDownloadInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2015 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dssapi.v3.download;
 
 import java.io.ByteArrayInputStream;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/executor/CreateUploadedDataSetExecutor.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/executor/CreateUploadedDataSetExecutor.java
index 20b81a77c8a..a16d3d1cbe4 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/executor/CreateUploadedDataSetExecutor.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/executor/CreateUploadedDataSetExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dssapi.v3.executor;
 
 import java.io.IOException;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/executor/ICreateUploadedDataSetExecutor.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/executor/ICreateUploadedDataSetExecutor.java
index 995215e6cba..30d4fa3689f 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/executor/ICreateUploadedDataSetExecutor.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/executor/ICreateUploadedDataSetExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dssapi.v3.executor;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id.DataSetPermId;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/pathinfo/DataSetContentNode.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/pathinfo/DataSetContentNode.java
index c8ded4bcdaa..270f7e0d4a5 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/pathinfo/DataSetContentNode.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/pathinfo/DataSetContentNode.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.ethz.sis.openbis.generic.server.dssapi.v3.pathinfo;
 
 interface DataSetContentNode
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/pathinfo/DirectoryNode.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/pathinfo/DirectoryNode.java
index 0f827aa2580..03271454634 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/pathinfo/DirectoryNode.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/pathinfo/DirectoryNode.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.ethz.sis.openbis.generic.server.dssapi.v3.pathinfo;
 
 import java.nio.file.Path;
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/pathinfo/FileNode.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/pathinfo/FileNode.java
index 9c037b54baf..c58f3958cd7 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/pathinfo/FileNode.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/pathinfo/FileNode.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.ethz.sis.openbis.generic.server.dssapi.v3.pathinfo;
 
 class FileNode implements DataSetContentNode
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/pathinfo/PathInfoFeeder.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/pathinfo/PathInfoFeeder.java
index 280f84f43fc..823e42acbb9 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/pathinfo/PathInfoFeeder.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/pathinfo/PathInfoFeeder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/upload/StoreShareFileUploadServlet.java b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/upload/StoreShareFileUploadServlet.java
index 738c8800527..5506f7dccf6 100644
--- a/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/upload/StoreShareFileUploadServlet.java
+++ b/server-original-data-store/source/java/ch/ethz/sis/openbis/generic/server/dssapi/v3/upload/StoreShareFileUploadServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dssapi.v3.upload;
 
 import java.io.IOException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractDataSetInfoExtractor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractDataSetInfoExtractor.java
index 80c0e09a4e3..c2f2cd47d3c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractDataSetInfoExtractor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractDataSetInfoExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractDelegatingDataSetInfoExtractor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractDelegatingDataSetInfoExtractor.java
index 163690e84c0..92a5042e97d 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractDelegatingDataSetInfoExtractor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractDelegatingDataSetInfoExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractDelegatingStorageProcessor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractDelegatingStorageProcessor.java
index 2a66da5746b..960a508f19c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractDelegatingStorageProcessor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractDelegatingStorageProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractDelegatingStorageProcessorTransaction.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractDelegatingStorageProcessorTransaction.java
index b0585842861..ccece7dc482 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractDelegatingStorageProcessorTransaction.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractDelegatingStorageProcessorTransaction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractPostRegistrationDataSetHandlerForFileBasedUndo.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractPostRegistrationDataSetHandlerForFileBasedUndo.java
index 12d32844878..739ac7c511f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractPostRegistrationDataSetHandlerForFileBasedUndo.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractPostRegistrationDataSetHandlerForFileBasedUndo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractStorageProcessor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractStorageProcessor.java
index 5dc0f12d57c..7ae7db998cb 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractStorageProcessor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractStorageProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractStorageProcessorTransaction.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractStorageProcessorTransaction.java
index 6bee3ecf303..16e938d052c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractStorageProcessorTransaction.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractStorageProcessorTransaction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractStrorageProcessorWithUploader.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractStrorageProcessorWithUploader.java
index 34f20efe82c..c250b2eb291 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractStrorageProcessorWithUploader.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractStrorageProcessorWithUploader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractTopLevelDataSetRegistrator.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractTopLevelDataSetRegistrator.java
index de622cfc999..7e9924d4e89 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractTopLevelDataSetRegistrator.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/AbstractTopLevelDataSetRegistrator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/BaseDirectoryHolder.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/BaseDirectoryHolder.java
index 2fc2a716d71..edcc7f0a3ae 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/BaseDirectoryHolder.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/BaseDirectoryHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ChannelSetHelper.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ChannelSetHelper.java
index 83d51434168..b3d7a0fd2de 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ChannelSetHelper.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ChannelSetHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.util.Collections;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/CifexStorageProcessor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/CifexStorageProcessor.java
index 3bf46830274..aad5f07951e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/CifexStorageProcessor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/CifexStorageProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ConfigProvider.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ConfigProvider.java
index 1fc33fd7555..528d0944e82 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ConfigProvider.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ConfigProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/Constants.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/Constants.java
index 3ea9b951438..7f53e114eae 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/Constants.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/Constants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataSetInfoExtractorWithFileNameProperty.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataSetInfoExtractorWithFileNameProperty.java
index 2bedbaba5a1..11e5592c4b2 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataSetInfoExtractorWithFileNameProperty.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataSetInfoExtractorWithFileNameProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataSetInfoFileNameDecorator.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataSetInfoFileNameDecorator.java
index 57802a6fef7..8a5c744ef47 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataSetInfoFileNameDecorator.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataSetInfoFileNameDecorator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataSetNameEntitiesProvider.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataSetNameEntitiesProvider.java
index 9732e8e6d08..39c1930ab60 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataSetNameEntitiesProvider.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataSetNameEntitiesProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithm.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithm.java
index f5552883292..5bf440f44bc 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithm.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithmRunner.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithmRunner.java
index 30e3eea3ac3..858eb73122e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithmRunner.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithmRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.util.Collections;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataSetRegistrationHelper.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataSetRegistrationHelper.java
index 2d964ff9d60..7ed2555f0c5 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataSetRegistrationHelper.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataSetRegistrationHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataSetRegistrationRollbacker.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataSetRegistrationRollbacker.java
index 337b8192c64..01d56467e9c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataSetRegistrationRollbacker.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataSetRegistrationRollbacker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataStoreStrategyKey.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataStoreStrategyKey.java
index 7473e5577f7..e0ce2471bc7 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataStoreStrategyKey.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataStoreStrategyKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataStrategyStore.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataStrategyStore.java
index 353f9bd1fed..7d81e34962a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataStrategyStore.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DataStrategyStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DefaultDataSetInfoExtractor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DefaultDataSetInfoExtractor.java
index 896d4aaa949..82c2c326f6a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DefaultDataSetInfoExtractor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DefaultDataSetInfoExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DefaultStorageProcessor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DefaultStorageProcessor.java
index 83d6b7999f5..b0bc98b9732 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DefaultStorageProcessor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DefaultStorageProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DelegatingStorageProcessorWithDropbox.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DelegatingStorageProcessorWithDropbox.java
index 9750f377209..181715093d9 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DelegatingStorageProcessorWithDropbox.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DelegatingStorageProcessorWithDropbox.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DispatcherStorageProcessor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DispatcherStorageProcessor.java
index 8b27a73a3ad..21064d3c9f0 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DispatcherStorageProcessor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DispatcherStorageProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DssRegistrationLogDirectoryHelper.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DssRegistrationLogDirectoryHelper.java
index 74426912222..c5c5c178e4f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DssRegistrationLogDirectoryHelper.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DssRegistrationLogDirectoryHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DssRegistrationLogger.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DssRegistrationLogger.java
index 5efd2d57895..c5650fa1abd 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DssRegistrationLogger.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DssRegistrationLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DssUniqueFilenameGenerator.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DssUniqueFilenameGenerator.java
index ac12ee1eb96..0d3cc9674ee 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DssUniqueFilenameGenerator.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DssUniqueFilenameGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DynamicTransactionQueryFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DynamicTransactionQueryFactory.java
index 0f30f274834..cf56e8f38a8 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DynamicTransactionQueryFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/DynamicTransactionQueryFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import javax.sql.DataSource;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ETLDaemon.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ETLDaemon.java
index 3026ea62b41..80917886718 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ETLDaemon.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ETLDaemon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ETLServerExposablePropertyPlaceholderConfigurer.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ETLServerExposablePropertyPlaceholderConfigurer.java
index 196ed97ffc6..339c845d924 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ETLServerExposablePropertyPlaceholderConfigurer.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ETLServerExposablePropertyPlaceholderConfigurer.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.etlserver;
 
 import java.util.HashMap;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ETLServerPlugin.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ETLServerPlugin.java
index 7620d1e10ae..38c342fcb30 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ETLServerPlugin.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ETLServerPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ETLServerPluginFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ETLServerPluginFactory.java
index 5a015b9bbf7..26b0a15bc27 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ETLServerPluginFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ETLServerPluginFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.util.HashMap;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/FileBasedFile.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/FileBasedFile.java
index a7e6ce2ab48..b7c38249d48 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/FileBasedFile.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/FileBasedFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/FileBasedFileFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/FileBasedFileFactory.java
index d182daebf77..37bd5183228 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/FileBasedFileFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/FileBasedFileFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/FileRenamer.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/FileRenamer.java
index 598b60a68c7..065d23ce6ac 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/FileRenamer.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/FileRenamer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/FileTypeExtractor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/FileTypeExtractor.java
index ae1fc382b19..5d178460037 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/FileTypeExtractor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/FileTypeExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/HCSImageCheckList.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/HCSImageCheckList.java
index e37692ed74e..dc8e63826f3 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/HCSImageCheckList.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/HCSImageCheckList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IArchiveCandidateDiscoverer.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IArchiveCandidateDiscoverer.java
index a63dc9fb357..30b5aac51c8 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IArchiveCandidateDiscoverer.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IArchiveCandidateDiscoverer.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.etlserver;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IAutoArchiverPolicy.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IAutoArchiverPolicy.java
index be4e02adf86..b811f3edc42 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IAutoArchiverPolicy.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IAutoArchiverPolicy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataSetHandler.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataSetHandler.java
index 20322b1f1cb..eef687a5b85 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataSetHandler.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataSetHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataSetHandlerRpc.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataSetHandlerRpc.java
index 5780f724a93..a33deac20de 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataSetHandlerRpc.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataSetHandlerRpc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataSetHandlerWithMailClient.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataSetHandlerWithMailClient.java
index 1c1b6a4f9ff..7ca15772713 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataSetHandlerWithMailClient.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataSetHandlerWithMailClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import ch.systemsx.cisd.common.mail.IMailClient;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataSetInfoExtractor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataSetInfoExtractor.java
index e3fabe1fc25..f4b1ac13334 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataSetInfoExtractor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataSetInfoExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataSetPathsInfoFeeder.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataSetPathsInfoFeeder.java
index a35468400d9..543f2eb942b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataSetPathsInfoFeeder.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataSetPathsInfoFeeder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataSetUploader.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataSetUploader.java
index 016a50e372b..90958be3026 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataSetUploader.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataSetUploader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataStoreStrategy.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataStoreStrategy.java
index ec58024c1cf..7e056b36bed 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataStoreStrategy.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataStoreStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataStrategyStore.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataStrategyStore.java
index dd1957e943a..d5a3e605815 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataStrategyStore.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IDataStrategyStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IETLServerPlugin.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IETLServerPlugin.java
index 0f1a432361d..d203ff41912 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IETLServerPlugin.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IETLServerPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IExtensibleDataSetHandler.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IExtensibleDataSetHandler.java
index 41f05323521..0b3dea9c966 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IExtensibleDataSetHandler.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IExtensibleDataSetHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IFile.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IFile.java
index dea64b8bc24..de92d3e3ac4 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IFile.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IFileFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IFileFactory.java
index 6fe516bddf0..83b28484d89 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IFileFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IFileFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IFileFormatTypeExtractor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IFileFormatTypeExtractor.java
index 7aeb576f1ec..04bf36d7a71 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IFileFormatTypeExtractor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IFileFormatTypeExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IPostRegistrationAction.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IPostRegistrationAction.java
index 564695f1662..34939d6364a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IPostRegistrationAction.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IPostRegistrationAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IPreRegistrationAction.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IPreRegistrationAction.java
index 4fc268e3b4a..a3499ef9833 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IPreRegistrationAction.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IPreRegistrationAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IProcessor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IProcessor.java
index 20c837f8db3..2feeb37a623 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IProcessor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IStorageProcessorTransactional.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IStorageProcessorTransactional.java
index 9d2ab580d59..1892fe1137a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IStorageProcessorTransactional.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IStorageProcessorTransactional.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IStoreRootDirectoryHolder.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IStoreRootDirectoryHolder.java
index 701da320a64..98849163828 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IStoreRootDirectoryHolder.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IStoreRootDirectoryHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ITopLevelDataSetRegistrator.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ITopLevelDataSetRegistrator.java
index 371adfc04f1..b4b93e45e14 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ITopLevelDataSetRegistrator.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ITopLevelDataSetRegistrator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ITopLevelDataSetRegistratorDelegate.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ITopLevelDataSetRegistratorDelegate.java
index 500ca1a9240..423cd794a30 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ITopLevelDataSetRegistratorDelegate.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ITopLevelDataSetRegistratorDelegate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ITypeExtractor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ITypeExtractor.java
index f119a25488c..47b64838b7f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ITypeExtractor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ITypeExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IdentifiedDataStrategy.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IdentifiedDataStrategy.java
index 040f567bc77..9e00d175a19 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IdentifiedDataStrategy.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/IdentifiedDataStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/NamedDataStrategy.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/NamedDataStrategy.java
index 2bb29a67456..afb1f5daaa0 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/NamedDataStrategy.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/NamedDataStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/NullStorageProcessorTransaction.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/NullStorageProcessorTransaction.java
index fffb9c629d7..5864117aa15 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/NullStorageProcessorTransaction.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/NullStorageProcessorTransaction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/Parameters.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/Parameters.java
index 8a2365324d8..d7bafeb054a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/Parameters.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/Parameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/PlateDimension.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/PlateDimension.java
index be1cf565c87..e2066e9a700 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/PlateDimension.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/PlateDimension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.Serializable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/PlateDimensionParser.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/PlateDimensionParser.java
index a3f8e8673a7..38cd613ac21 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/PlateDimensionParser.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/PlateDimensionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IEntityProperty;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/PropertiesBasedETLServerPlugin.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/PropertiesBasedETLServerPlugin.java
index 4e63c87c16b..f5080b18a61 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/PropertiesBasedETLServerPlugin.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/PropertiesBasedETLServerPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import static ch.systemsx.cisd.etlserver.IDataSetInfoExtractor.EXTRACTOR_KEY;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/SampleRegisteringDropbox.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/SampleRegisteringDropbox.java
index d1b1b8a3e4f..6bf6c9b8727 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/SampleRegisteringDropbox.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/SampleRegisteringDropbox.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/SimpleTypeExtractor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/SimpleTypeExtractor.java
index 379b64275b0..5a6b2515dd3 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/SimpleTypeExtractor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/SimpleTypeExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/SmartParentDataSetInfoExtractor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/SmartParentDataSetInfoExtractor.java
index 1aa733ca0ec..2c2e70a023e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/SmartParentDataSetInfoExtractor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/SmartParentDataSetInfoExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/StandardProcessor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/StandardProcessor.java
index 0980515b7e5..dd8f6a1b1c2 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/StandardProcessor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/StandardProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/StorageProcessorWithDropbox.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/StorageProcessorWithDropbox.java
index eca7bcb68e8..908ecce2a2e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/StorageProcessorWithDropbox.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/StorageProcessorWithDropbox.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ThreadParameters.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ThreadParameters.java
index 4c5e2af7a7e..6a8d9632af1 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ThreadParameters.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/ThreadParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/TopLevelDataSetRegistratorGlobalState.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/TopLevelDataSetRegistratorGlobalState.java
index 2f08fbc9896..ea4cc54ed2d 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/TopLevelDataSetRegistratorGlobalState.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/TopLevelDataSetRegistratorGlobalState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandler.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandler.java
index 9e44f833221..18781cdb587 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandler.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/api/v1/DataSetTypeToRegistratorMapper.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/api/v1/DataSetTypeToRegistratorMapper.java
index 6843a06f304..f7cbb90f6c3 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/api/v1/DataSetTypeToRegistratorMapper.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/api/v1/DataSetTypeToRegistratorMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.api.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetExecutor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetExecutor.java
index 0b2fd226dd6..53a63ea1203 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetExecutor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.api.v1;
 
 import java.io.BufferedOutputStream;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetServerPluginHolder.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetServerPluginHolder.java
index 589c8cb48c0..0b422d9f0b1 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetServerPluginHolder.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetServerPluginHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.api.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetService.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetService.java
index 723e51c55b4..f8db2cc3848 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.api.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetTopLevelDataSetHandler.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetTopLevelDataSetHandler.java
index 8722cbba53d..16a5820fbd3 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetTopLevelDataSetHandler.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetTopLevelDataSetHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.api.v1;
 
 import java.io.BufferedOutputStream;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetUtil.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetUtil.java
index e4e52ccca45..0a71c8084ca 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetUtil.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.api.v1;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/cifex/CifexDataSetInfoExtractor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/cifex/CifexDataSetInfoExtractor.java
index aaac8986374..d5e9fe19552 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/cifex/CifexDataSetInfoExtractor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/cifex/CifexDataSetInfoExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.cifex;
 
 import static ch.systemsx.cisd.etlserver.AbstractDataSetInfoExtractor.extractDataSetProperties;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/cifex/CifexExtractorHelper.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/cifex/CifexExtractorHelper.java
index 29c0784914d..fd6060aa0ad 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/cifex/CifexExtractorHelper.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/cifex/CifexExtractorHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.cifex;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/cifex/CifexTypeExtractor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/cifex/CifexTypeExtractor.java
index 9381c80cdac..710d285f90d 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/cifex/CifexTypeExtractor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/cifex/CifexTypeExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.cifex;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/AbstractSampleAndDataSetProcessor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/AbstractSampleAndDataSetProcessor.java
index 85849f33881..0aa5b91f634 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/AbstractSampleAndDataSetProcessor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/AbstractSampleAndDataSetProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.entityregistration;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/RegistrationStatus.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/RegistrationStatus.java
index e9638aff232..44e8b990c4a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/RegistrationStatus.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/RegistrationStatus.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.etlserver.entityregistration;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/SampleAndDataSetControlFileProcessor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/SampleAndDataSetControlFileProcessor.java
index 2cf31a6d8b0..f92357c0e7e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/SampleAndDataSetControlFileProcessor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/SampleAndDataSetControlFileProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.entityregistration;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/SampleAndDataSetFolderProcessor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/SampleAndDataSetFolderProcessor.java
index 291104b8b66..6db56a9ec68 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/SampleAndDataSetFolderProcessor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/SampleAndDataSetFolderProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.entityregistration;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/SampleAndDataSetRegistrationGlobalState.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/SampleAndDataSetRegistrationGlobalState.java
index c7ab280a31e..73b62954b56 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/SampleAndDataSetRegistrationGlobalState.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/SampleAndDataSetRegistrationGlobalState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.entityregistration;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/SampleAndDataSetRegistrationHandler.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/SampleAndDataSetRegistrationHandler.java
index 7a2033294e2..06390320c17 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/SampleAndDataSetRegistrationHandler.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/SampleAndDataSetRegistrationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.entityregistration;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/SampleAndDataSetRegistrator.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/SampleAndDataSetRegistrator.java
index 0a2229924bf..290002073aa 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/SampleAndDataSetRegistrator.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/SampleAndDataSetRegistrator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.entityregistration;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/SampleDataSetPair.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/SampleDataSetPair.java
index ebbba0720da..ace444da86e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/SampleDataSetPair.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/SampleDataSetPair.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.entityregistration;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/SampleDataSetPairParserObjectFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/SampleDataSetPairParserObjectFactory.java
index 627deb7e152..5a491b42c8a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/SampleDataSetPairParserObjectFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/entityregistration/SampleDataSetPairParserObjectFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.entityregistration;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/hdf5/HDF5StorageProcessor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/hdf5/HDF5StorageProcessor.java
index 678d73bb39c..df676362898 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/hdf5/HDF5StorageProcessor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/hdf5/HDF5StorageProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.hdf5;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/AbstractPathInfoDatabaseFeedingTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/AbstractPathInfoDatabaseFeedingTask.java
index 1216392cf47..481cedec0a8 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/AbstractPathInfoDatabaseFeedingTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/AbstractPathInfoDatabaseFeedingTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.path;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/DataSetAndPathInfoDBConsistencyCheckTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/DataSetAndPathInfoDBConsistencyCheckTask.java
index ec7a14049d9..1665f60ff15 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/DataSetAndPathInfoDBConsistencyCheckTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/DataSetAndPathInfoDBConsistencyCheckTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.path;
 
 import java.text.DateFormat;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/DatabaseBasedDataSetPathsInfoFeeder.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/DatabaseBasedDataSetPathsInfoFeeder.java
index d14d4bb9c84..a4b1176d6a3 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/DatabaseBasedDataSetPathsInfoFeeder.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/DatabaseBasedDataSetPathsInfoFeeder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.path;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/IPathsInfoDAO.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/IPathsInfoDAO.java
index 6c30ea66d68..ffb76127be5 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/IPathsInfoDAO.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/IPathsInfoDAO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.path;
 
 import java.util.Collection;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/PathEntryDTO.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/PathEntryDTO.java
index 525a833b7eb..7dff845ac9a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/PathEntryDTO.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/PathEntryDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.path;
 
 import java.util.Date;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseChecksumCalculationTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseChecksumCalculationTask.java
index e7be667a19f..4fd61793cb2 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseChecksumCalculationTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseChecksumCalculationTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.path;
 
 import java.io.InputStream;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseFeedingTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseFeedingTask.java
index 179c8073a00..bc850baf7c8 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseFeedingTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseFeedingTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.path;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseRefreshingTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseRefreshingTask.java
index 22d2ad434a2..21b52d0df74 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseRefreshingTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseRefreshingTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.path;
 
 import java.text.ParseException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/TimeInterval.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/TimeInterval.java
index cd18adf21a0..c9869977d15 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/TimeInterval.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/path/TimeInterval.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.path;
 
 import java.util.Calendar;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/AbstractDataSetDeletionPostProcessingMaintenanceTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/AbstractDataSetDeletionPostProcessingMaintenanceTask.java
index 8fcae5be782..ad779996452 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/AbstractDataSetDeletionPostProcessingMaintenanceTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/AbstractDataSetDeletionPostProcessingMaintenanceTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/AbstractDataSetDeletionPostProcessingMaintenanceTaskWhichHandlesLastSeenEvent.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/AbstractDataSetDeletionPostProcessingMaintenanceTaskWhichHandlesLastSeenEvent.java
index d68ece33878..ca1e4d5bd6e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/AbstractDataSetDeletionPostProcessingMaintenanceTaskWhichHandlesLastSeenEvent.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/AbstractDataSetDeletionPostProcessingMaintenanceTaskWhichHandlesLastSeenEvent.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2021 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.etlserver.plugins;
 
 import ch.systemsx.cisd.common.filesystem.FileUtilities;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/AbstractMaintenanceTaskWithStateFile.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/AbstractMaintenanceTaskWithStateFile.java
index dcc070a9402..e9e6594ee40 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/AbstractMaintenanceTaskWithStateFile.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/AbstractMaintenanceTaskWithStateFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/AgeArchiveCandidateDiscoverer.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/AgeArchiveCandidateDiscoverer.java
index 5b558e7afde..49d703c3fa0 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/AgeArchiveCandidateDiscoverer.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/AgeArchiveCandidateDiscoverer.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/AutoArchiverTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/AutoArchiverTask.java
index b86503f4ad7..85dc0678130 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/AutoArchiverTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/AutoArchiverTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.util.HashMap;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/BaseGroupingPolicy.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/BaseGroupingPolicy.java
index 7728c9c775e..150e5d22a42 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/BaseGroupingPolicy.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/BaseGroupingPolicy.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.util.Collection;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/BlastDatabaseCreationMaintenanceTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/BlastDatabaseCreationMaintenanceTask.java
index 2ed8f0501ef..8afcb18e783 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/BlastDatabaseCreationMaintenanceTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/BlastDatabaseCreationMaintenanceTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, SIS
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.io.BufferedReader;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/ByExperimentPolicy.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/ByExperimentPolicy.java
index 53102b27f90..bed876edbaa 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/ByExperimentPolicy.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/ByExperimentPolicy.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/BySpacePolicy.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/BySpacePolicy.java
index 8e922393401..269ea949d94 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/BySpacePolicy.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/BySpacePolicy.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DataSetArchiverOrphanFinderTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DataSetArchiverOrphanFinderTask.java
index 945cd9f2c90..3c05bd64c3a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DataSetArchiverOrphanFinderTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DataSetArchiverOrphanFinderTask.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DataSetDeletionMaintenanceTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DataSetDeletionMaintenanceTask.java
index 7f1895feef4..8ec95d0ebed 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DataSetDeletionMaintenanceTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DataSetDeletionMaintenanceTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DataSetMover.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DataSetMover.java
index 31be0c2a4c0..cd227e95af2 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DataSetMover.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DataSetMover.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DeleteDataSetsAlreadyDeletedInApplicationServerMaintenanceTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DeleteDataSetsAlreadyDeletedInApplicationServerMaintenanceTask.java
index 06156ae142c..7e5f909eb83 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DeleteDataSetsAlreadyDeletedInApplicationServerMaintenanceTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DeleteDataSetsAlreadyDeletedInApplicationServerMaintenanceTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DeleteFromArchiveMaintenanceTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DeleteFromArchiveMaintenanceTask.java
index 9d6ad961f14..f83cb03f9c0 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DeleteFromArchiveMaintenanceTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DeleteFromArchiveMaintenanceTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DeleteFromExternalDBMaintenanceTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DeleteFromExternalDBMaintenanceTask.java
index f542ed3acdc..7346a93bf6f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DeleteFromExternalDBMaintenanceTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DeleteFromExternalDBMaintenanceTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DirectoryAction.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DirectoryAction.java
index 459e79463aa..03d8b174054 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DirectoryAction.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DirectoryAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DummyAutoArchiverPolicy.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DummyAutoArchiverPolicy.java
index 029e66b9ba3..779ff959545 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DummyAutoArchiverPolicy.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/DummyAutoArchiverPolicy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/ExperimentBasedArchivingTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/ExperimentBasedArchivingTask.java
index 9ff2bf86d26..12d6cd0df25 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/ExperimentBasedArchivingTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/ExperimentBasedArchivingTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/FastaFileBuilderForDataSetFiles.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/FastaFileBuilderForDataSetFiles.java
index 01b3f3bdc8d..81d874f19fd 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/FastaFileBuilderForDataSetFiles.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/FastaFileBuilderForDataSetFiles.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, SIS
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/FileSystemMonitoringMaintenanceTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/FileSystemMonitoringMaintenanceTask.java
index 56b4db83ce5..0eccac475dc 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/FileSystemMonitoringMaintenanceTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/FileSystemMonitoringMaintenanceTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTask.java
index a34e5095d9d..252df408e28 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/GenericFastaFileBuilder.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/GenericFastaFileBuilder.java
index b25b2af102b..c2af1e92eff 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/GenericFastaFileBuilder.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/GenericFastaFileBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, SIS
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.io.BufferedWriter;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/GroupingPolicy.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/GroupingPolicy.java
index 3b3ed491da6..302b2af2a4b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/GroupingPolicy.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/GroupingPolicy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, SIS
+ * Copyright ETH 2015 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.text.SimpleDateFormat;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/HierarchicalPath.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/HierarchicalPath.java
index 637067fcbf0..d762072db12 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/HierarchicalPath.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/HierarchicalPath.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.etlserver.plugins;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ContainerDataSet;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/HierarchicalStorageUpdater.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/HierarchicalStorageUpdater.java
index 6b1ac0f6d21..799b97eca2c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/HierarchicalStorageUpdater.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/HierarchicalStorageUpdater.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/IDataSetMover.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/IDataSetMover.java
index 966ad197445..d9d0977be05 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/IDataSetMover.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/IDataSetMover.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/IHierarchicalStorageLinkNamingStrategy.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/IHierarchicalStorageLinkNamingStrategy.java
index 1577d025b0b..d4c1a8a04f6 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/IHierarchicalStorageLinkNamingStrategy.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/IHierarchicalStorageLinkNamingStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/ISegmentedStoreShuffling.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/ISegmentedStoreShuffling.java
index c7fbf8c6493..7a87b45e56a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/ISegmentedStoreShuffling.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/ISegmentedStoreShuffling.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/ImportState.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/ImportState.java
index ac52190b2c3..aca13037802 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/ImportState.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/ImportState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/ImportStateMarkerFile.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/ImportStateMarkerFile.java
index cc3a8053ee3..43fcc652064 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/ImportStateMarkerFile.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/ImportStateMarkerFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/MonitoredDirectory.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/MonitoredDirectory.java
index d1dd35f4f78..fa51dec2f89 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/MonitoredDirectory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/MonitoredDirectory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/ResetArchivePendingTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/ResetArchivePendingTask.java
index 2cac9c1b419..559de7baccb 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/ResetArchivePendingTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/ResetArchivePendingTask.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/SegmentedStoreShufflingTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/SegmentedStoreShufflingTask.java
index 8a9a365d124..7ebd0031d4a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/SegmentedStoreShufflingTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/SegmentedStoreShufflingTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import static ch.systemsx.cisd.common.logging.LogLevel.INFO;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/SimpleShuffling.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/SimpleShuffling.java
index 2ed29a0f569..699e2ec45c1 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/SimpleShuffling.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/SimpleShuffling.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import static ch.systemsx.cisd.common.logging.LogLevel.INFO;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/SimpleShufflingShareFinder.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/SimpleShufflingShareFinder.java
index f2d7dcd2057..09b9d89f9ce 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/SimpleShufflingShareFinder.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/SimpleShufflingShareFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/TagArchiveCandidateDiscoverer.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/TagArchiveCandidateDiscoverer.java
index 63a11c0c37a..ee8d628b277 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/TagArchiveCandidateDiscoverer.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/TagArchiveCandidateDiscoverer.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/TemplateBasedLinkNamingStrategy.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/TemplateBasedLinkNamingStrategy.java
index 283c9abbd28..d9d6778f6a0 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/TemplateBasedLinkNamingStrategy.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/TemplateBasedLinkNamingStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/WriteDirectoryNameToDropboxAction.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/WriteDirectoryNameToDropboxAction.java
index fb2ce593ac6..048945b3649 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/WriteDirectoryNameToDropboxAction.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/WriteDirectoryNameToDropboxAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/grouping/DatasetListWithTotal.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/grouping/DatasetListWithTotal.java
index 29b09b68ec0..992ce3cdd56 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/grouping/DatasetListWithTotal.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/grouping/DatasetListWithTotal.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.etlserver.plugins.grouping;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/grouping/Grouping.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/grouping/Grouping.java
index dfb5744f585..207e9c2fed8 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/grouping/Grouping.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/grouping/Grouping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins.grouping;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AbstractExternalData;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/grouping/IGroupKeyProvider.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/grouping/IGroupKeyProvider.java
index f274751d838..62f6cbbf42e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/grouping/IGroupKeyProvider.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/plugins/grouping/IGroupKeyProvider.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.etlserver.plugins.grouping;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AbstractExternalData;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/AbstractPostRegistrationTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/AbstractPostRegistrationTask.java
index d62f43b4392..70b22411da4 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/AbstractPostRegistrationTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/AbstractPostRegistrationTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.postregistration;
 
 import java.util.Properties;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/AbstractPostRegistrationTaskForPhysicalDataSets.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/AbstractPostRegistrationTaskForPhysicalDataSets.java
index af7c460188f..6b53314b57b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/AbstractPostRegistrationTaskForPhysicalDataSets.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/AbstractPostRegistrationTaskForPhysicalDataSets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.postregistration;
 
 import java.util.Properties;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/ArchivingExecutor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/ArchivingExecutor.java
index fe7feb93a52..a88400b3551 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/ArchivingExecutor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/ArchivingExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.postregistration;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetArchivingStatus.AVAILABLE;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/ArchivingPostRegistrationTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/ArchivingPostRegistrationTask.java
index 47419d50b16..727a7c5bdbe 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/ArchivingPostRegistrationTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/ArchivingPostRegistrationTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.postregistration;
 
 import java.util.Properties;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/DummyPostRegistrationTaskExecutor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/DummyPostRegistrationTaskExecutor.java
index 5a7dd3f8f59..d022fc209ef 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/DummyPostRegistrationTaskExecutor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/DummyPostRegistrationTaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.postregistration;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/EagerShufflingTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/EagerShufflingTask.java
index 406b8f17a23..e3322a03583 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/EagerShufflingTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/EagerShufflingTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.postregistration;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/Hdf5CompressingPostRegistrationTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/Hdf5CompressingPostRegistrationTask.java
index d27b5f76af4..7d1a298b48c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/Hdf5CompressingPostRegistrationTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/Hdf5CompressingPostRegistrationTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.postregistration;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/ICleanupTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/ICleanupTask.java
index d673d913156..f2f68d146ac 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/ICleanupTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/ICleanupTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.postregistration;
 
 import java.io.Serializable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/IPostRegistrationTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/IPostRegistrationTask.java
index 17793d343a4..ede1776826a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/IPostRegistrationTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/IPostRegistrationTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.postregistration;
 
 import java.util.Properties;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/IPostRegistrationTaskExecutor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/IPostRegistrationTaskExecutor.java
index 229ecf51055..73842b62203 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/IPostRegistrationTaskExecutor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/IPostRegistrationTaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.postregistration;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/NoCleanupTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/NoCleanupTask.java
index 18cde27d3cf..942db5a04ab 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/NoCleanupTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/NoCleanupTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.postregistration;
 
 import ch.systemsx.cisd.common.logging.ISimpleLogger;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/NotifyingTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/NotifyingTask.java
index 5d6d702c4cc..3db53504263 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/NotifyingTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/NotifyingTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.postregistration;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/PostRegistrationMaintenanceTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/PostRegistrationMaintenanceTask.java
index 47175d80853..c714bf104a7 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/PostRegistrationMaintenanceTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/PostRegistrationMaintenanceTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.postregistration;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/RequestArchivingPostRegistrationTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/RequestArchivingPostRegistrationTask.java
index 2bb6defd5af..dc93185725e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/RequestArchivingPostRegistrationTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/RequestArchivingPostRegistrationTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.postregistration;
 
 import java.util.*;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/SecondCopyPostRegistrationTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/SecondCopyPostRegistrationTask.java
index 36d350cabd3..9e923953345 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/SecondCopyPostRegistrationTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/SecondCopyPostRegistrationTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.postregistration;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/SimpleShareFinder.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/SimpleShareFinder.java
index 170fa113b1e..44dc7facd10 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/SimpleShareFinder.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/SimpleShareFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.postregistration;
 
 import java.util.Properties;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/TaskExecutor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/TaskExecutor.java
index 100cd191a41..309867d2ee8 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/TaskExecutor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/postregistration/TaskExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.postregistration;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetFile.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetFile.java
index 18a30d8d87c..15dbba980a4 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetFile.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetFile.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.etlserver.registrator;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetRegistrationContext.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetRegistrationContext.java
index abdd62237f4..d2bd928141b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetRegistrationContext.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetRegistrationContext.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.etlserver.registrator;
 
 import net.lemnik.eodsql.DynamicTransactionQuery;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetRegistrationDetails.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetRegistrationDetails.java
index 75a8a0d47c8..39c3c2f7eb9 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetRegistrationDetails.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetRegistrationDetails.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetRegistrationPersistentMap.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetRegistrationPersistentMap.java
index c1afd5f39a2..e0fd9fe0ebd 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetRegistrationPersistentMap.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetRegistrationPersistentMap.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.etlserver.registrator;
 
 import java.io.Serializable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetRegistrationPreStagingBehavior.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetRegistrationPreStagingBehavior.java
index d7a53a3f6e0..fd27f39beef 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetRegistrationPreStagingBehavior.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/DataSetRegistrationPreStagingBehavior.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.etlserver.registrator;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/DefaultDropbox.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/DefaultDropbox.java
index 8524078c2f1..94c9b7157be 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/DefaultDropbox.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/DefaultDropbox.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator;
 
 import ch.systemsx.cisd.etlserver.registrator.api.v2.AbstractJavaDataSetRegistrationDropboxV2;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/DistinctExceptionsCollection.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/DistinctExceptionsCollection.java
index 6d4ac6a6d5f..2674430765a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/DistinctExceptionsCollection.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/DistinctExceptionsCollection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator;
 
 import java.util.HashMap;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/IEntityOperationService.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/IEntityOperationService.java
index 1fd85848e82..5c8fa9f76bf 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/IEntityOperationService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/IEntityOperationService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.dto.AtomicEntityOperationDetails;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/IRollbackStack.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/IRollbackStack.java
index a2be3c00054..dde223ddc4e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/IRollbackStack.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/IRollbackStack.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/ITransactionalCommand.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/ITransactionalCommand.java
index 900f8353a73..b562cabccd3 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/ITransactionalCommand.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/ITransactionalCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator;
 
 import java.io.Serializable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/IncomingFileDeletedBeforeRegistrationException.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/IncomingFileDeletedBeforeRegistrationException.java
index 51035baac06..05890543ef6 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/IncomingFileDeletedBeforeRegistrationException.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/IncomingFileDeletedBeforeRegistrationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetHandler.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetHandler.java
index 5459c284091..ec5cee81d48 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetHandler.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator;
 
 import ch.systemsx.cisd.etlserver.TopLevelDataSetRegistratorGlobalState;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/MarkerFileUtility.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/MarkerFileUtility.java
index 949fbc51760..18d2ef43f7b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/MarkerFileUtility.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/MarkerFileUtility.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/TopLevelDataSetChecker.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/TopLevelDataSetChecker.java
index 876ea10f703..9e12eaf3757 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/TopLevelDataSetChecker.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/TopLevelDataSetChecker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/impl/AbstractTransactionalCommand.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/impl/AbstractTransactionalCommand.java
index b36f743130d..54a14cc7e12 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/impl/AbstractTransactionalCommand.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/impl/AbstractTransactionalCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.impl;
 
 import org.apache.log4j.Logger;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/impl/MkdirsCommand.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/impl/MkdirsCommand.java
index c74bfe97de9..dcd11fb9ce9 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/impl/MkdirsCommand.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/impl/MkdirsCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.impl;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/impl/MoveFileCommand.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/impl/MoveFileCommand.java
index 3fd5a4cd73d..d79131214de 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/impl/MoveFileCommand.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/impl/MoveFileCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.impl;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/impl/NewFileCommand.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/impl/NewFileCommand.java
index 88cb19ce5dd..a51a2f13e6f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/impl/NewFileCommand.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/impl/NewFileCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.impl;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/impl/NewLinkCommand.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/impl/NewLinkCommand.java
index 31b17c9bbe9..716f4ed86e1 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/impl/NewLinkCommand.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/impl/NewLinkCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.impl;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/impl/RollbackStack.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/impl/RollbackStack.java
index bc442d4ed97..a1c1b1ad75a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/impl/RollbackStack.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/impl/RollbackStack.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.impl;
 
 import java.io.DataInputStream;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/impl/SecondaryTransactionFailure.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/impl/SecondaryTransactionFailure.java
index 59055d657b5..7242e9f0e24 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/impl/SecondaryTransactionFailure.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/impl/SecondaryTransactionFailure.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.impl;
 
 import net.lemnik.eodsql.DynamicTransactionQuery;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IDataSet.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IDataSet.java
index e9a1b0a667e..49be625c76d 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IDataSet.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IDataSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1;
 
 import ch.systemsx.cisd.openbis.generic.shared.Constants;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IDataSetRegistrationTransaction.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IDataSetRegistrationTransaction.java
index 5f195d698f6..f73ea652843 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IDataSetRegistrationTransaction.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IDataSetRegistrationTransaction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IDataSetUpdatable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IDataSetUpdatable.java
index b285d104bd5..47d11f089a7 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IDataSetUpdatable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IDataSetUpdatable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IExperiment.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IExperiment.java
index b69361bda70..a5ac93cb67c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IExperiment.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IExperiment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IExperimentUpdatable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IExperimentUpdatable.java
index 009af1aeacd..71e920bbdb0 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IExperimentUpdatable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IExperimentUpdatable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IExperimentImmutable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IExternalDataManagementSystem.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IExternalDataManagementSystem.java
index 69635f06bd8..986589ded44 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IExternalDataManagementSystem.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IExternalDataManagementSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IExternalDataManagementSystemImmutable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IJavaDataSetRegistrationDropboxV1.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IJavaDataSetRegistrationDropboxV1.java
index 0e11703f692..30b800b929e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IJavaDataSetRegistrationDropboxV1.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IJavaDataSetRegistrationDropboxV1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IMaterial.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IMaterial.java
index 99f2472cf62..5d5fd103365 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IMaterial.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IMaterial.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IMaterialImmutable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IMetaproject.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IMetaproject.java
index b23580940cd..1b8e04f9d85 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IMetaproject.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IMetaproject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IMetaprojectContent;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IProject.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IProject.java
index c7f41c2910e..43e8f9ac62d 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IProject.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IProject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IProjectImmutable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/ISample.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/ISample.java
index 5ef4ab4c757..b0e54dd8c1c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/ISample.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/ISample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/ISpace.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/ISpace.java
index 9347c5a1a2b..4d176472ced 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/ISpace.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/ISpace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.ISpaceImmutable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IVocabulary.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IVocabulary.java
index b337426a810..46ca9ff3acf 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IVocabulary.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IVocabulary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IVocabularyImmutable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IVocabularyTerm.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IVocabularyTerm.java
index abacf1a9daf..a039d895c30 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IVocabularyTerm.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IVocabularyTerm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IVocabularyTermImmutable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/AbstractDataSetImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/AbstractDataSetImmutable.java
index ca14af5d216..4af47cefa44 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/AbstractDataSetImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/AbstractDataSetImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import java.util.Collection;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/AbstractTransactionState.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/AbstractTransactionState.java
index 14d359d28ce..bb7aae400b8 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/AbstractTransactionState.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/AbstractTransactionState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/AuthorizationHelper.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/AuthorizationHelper.java
index 0a99e329a7b..cd67a3bb3c7 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/AuthorizationHelper.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/AuthorizationHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import java.util.Collections;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/AuthorizationService.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/AuthorizationService.java
index ffe2c2cf551..03f69a41c17 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/AuthorizationService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/AuthorizationService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ConversionUtils.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ConversionUtils.java
index ffb8cd64ee1..c91373b9677 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ConversionUtils.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ConversionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import java.util.Collection;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSet.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSet.java
index 4c10a6185f5..17183d44b22 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSet.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetImmutable.java
index c2719a881d0..35e60e783ff 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransaction.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransaction.java
index 9950b0ff769..9a4d0bdc13f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransaction.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransaction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetUpdatable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetUpdatable.java
index 55d30ab9c29..b697fb75209 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetUpdatable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetUpdatable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Experiment.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Experiment.java
index 0bb593347da..51058291221 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Experiment.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Experiment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExperimentImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExperimentImmutable.java
index 58ad4c3a60f..1f345d2965a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExperimentImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExperimentImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExperimentUpdatable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExperimentUpdatable.java
index 815952ec329..ce57fff759e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExperimentUpdatable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExperimentUpdatable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExternalDataManagementSystem.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExternalDataManagementSystem.java
index d8e6aa6e8f5..a10fd6f2bae 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExternalDataManagementSystem.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExternalDataManagementSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import ch.systemsx.cisd.etlserver.registrator.api.v1.IExternalDataManagementSystem;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExternalDataManagementSystemImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExternalDataManagementSystemImmutable.java
index 1e9a6e0b73a..bbaa66483de 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExternalDataManagementSystemImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExternalDataManagementSystemImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IExternalDataManagementSystemImmutable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Material.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Material.java
index 7e945657812..2760859cbf1 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Material.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Material.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/MaterialImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/MaterialImmutable.java
index 2a50f18b112..fae308007c0 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/MaterialImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/MaterialImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Metaproject.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Metaproject.java
index 0b152a5f145..087bf5dee8a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Metaproject.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Metaproject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import java.util.HashSet;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/MetaprojectAssignments.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/MetaprojectAssignments.java
index aa39827734e..eb5d2cadb42 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/MetaprojectAssignments.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/MetaprojectAssignments.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import java.util.LinkedList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/MetaprojectImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/MetaprojectImmutable.java
index d34aecfe5e6..2dc8d74ef12 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/MetaprojectImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/MetaprojectImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IMetaprojectImmutable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Project.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Project.java
index f81c9ad9213..387943a3e99 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Project.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Project.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ProjectImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ProjectImmutable.java
index 548624519bf..9d925d22d89 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ProjectImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ProjectImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/PropertyAssignmentImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/PropertyAssignmentImmutable.java
index 5e83ce75741..59f949d3626 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/PropertyAssignmentImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/PropertyAssignmentImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IPropertyAssignmentImmutable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/RollbackConfigurator.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/RollbackConfigurator.java
index 5299f90be65..ad996974a07 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/RollbackConfigurator.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/RollbackConfigurator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/RollbackStack.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/RollbackStack.java
index 9001405b111..a030518f86b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/RollbackStack.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/RollbackStack.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Sample.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Sample.java
index 27ba0600401..f673fd51127 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Sample.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Sample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SampleImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SampleImmutable.java
index 6503bd35196..46bed6167d9 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SampleImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SampleImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SearchService.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SearchService.java
index f30b09099df..23d3c614cc8 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SearchService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SearchService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Space.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Space.java
index 982117f5884..94f67243daf 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Space.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Space.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import ch.systemsx.cisd.etlserver.registrator.api.v1.ISpace;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SpaceImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SpaceImmutable.java
index b4e2ebb2381..c0e2ebde9d4 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SpaceImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SpaceImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Vocabulary.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Vocabulary.java
index 8fecb21c0f3..b68f86c4af2 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Vocabulary.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Vocabulary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import java.util.Collections;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/VocabularyImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/VocabularyImmutable.java
index f423bedb2cf..8f8e2611084 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/VocabularyImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/VocabularyImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import java.util.LinkedList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/VocabularyTerm.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/VocabularyTerm.java
index 39da1501f0b..354f2dc130f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/VocabularyTerm.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/VocabularyTerm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import ch.systemsx.cisd.etlserver.registrator.api.v1.IVocabularyTerm;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/VocabularyTermImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/VocabularyTermImmutable.java
index ddb034aebf5..616d9ab95ca 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/VocabularyTermImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/VocabularyTermImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IVocabularyTermImmutable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/AbstractJavaDataSetRegistrationDropboxV2.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/AbstractJavaDataSetRegistrationDropboxV2.java
index 3b203f1d9cd..dea4f609ae9 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/AbstractJavaDataSetRegistrationDropboxV2.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/AbstractJavaDataSetRegistrationDropboxV2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2;
 
 import ch.systemsx.cisd.common.exceptions.NotImplementedException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/DataSetRegistrationServiceV2.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/DataSetRegistrationServiceV2.java
index f122704e054..81e85b93d21 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/DataSetRegistrationServiceV2.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/DataSetRegistrationServiceV2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2;
 
 import ch.systemsx.cisd.common.action.IDelegatedActionWithResult;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/DataSetRegistrationTransactionV2Delegate.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/DataSetRegistrationTransactionV2Delegate.java
index e7ed6a803c2..d4ceb98dc3c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/DataSetRegistrationTransactionV2Delegate.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/DataSetRegistrationTransactionV2Delegate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IDSSRegistrationLogger.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IDSSRegistrationLogger.java
index 65696fb1aeb..6bb5083ec58 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IDSSRegistrationLogger.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IDSSRegistrationLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IDataSet.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IDataSet.java
index d8d112a4196..a84c3139a01 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IDataSet.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IDataSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2;
 
 import ch.systemsx.cisd.openbis.generic.shared.Constants;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IDataSetRegistrationTransactionV2.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IDataSetRegistrationTransactionV2.java
index b5706110353..e4f73f9ccd8 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IDataSetRegistrationTransactionV2.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IDataSetRegistrationTransactionV2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IDataSetUpdatable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IDataSetUpdatable.java
index 215a7ea6550..5b6b74938d6 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IDataSetUpdatable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IDataSetUpdatable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IExperiment.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IExperiment.java
index b9662e2e4c7..12c78119406 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IExperiment.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IExperiment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IExperimentUpdatable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IExperimentUpdatable.java
index 94d30dd072d..e7d066d29bd 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IExperimentUpdatable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IExperimentUpdatable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2.IExperimentImmutable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IExternalDataManagementSystem.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IExternalDataManagementSystem.java
index 9c07c962141..c960d09bd70 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IExternalDataManagementSystem.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IExternalDataManagementSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2.IExternalDataManagementSystemImmutable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IJavaDataSetRegistrationDropboxV2.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IJavaDataSetRegistrationDropboxV2.java
index 30e760813e4..09ddb80e897 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IJavaDataSetRegistrationDropboxV2.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IJavaDataSetRegistrationDropboxV2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2;
 
 import ch.ethz.cisd.hotdeploy.Plugin;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IMaterial.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IMaterial.java
index 712722b17b3..1e4d8230370 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IMaterial.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IMaterial.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2.IMaterialImmutable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IMetaproject.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IMetaproject.java
index 6443bb7433d..01f501f459a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IMetaproject.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IMetaproject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2.IMetaprojectContent;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IProject.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IProject.java
index 44777433647..4be6e776b6f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IProject.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IProject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2.IProjectImmutable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/ISample.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/ISample.java
index 380ab52b8d6..c3daf047268 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/ISample.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/ISample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/ISpace.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/ISpace.java
index 0e9de0d8f83..ea304c07646 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/ISpace.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/ISpace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2.ISpaceImmutable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IVocabulary.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IVocabulary.java
index 6dd4d0a9bfa..1a01a1eb738 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IVocabulary.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IVocabulary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2.IVocabularyImmutable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IVocabularyTerm.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IVocabularyTerm.java
index dce07f3bef0..466d6f2bb5c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IVocabularyTerm.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/IVocabularyTerm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2.IVocabularyTermImmutable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JavaTopLevelDataSetHandlerV2.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JavaTopLevelDataSetHandlerV2.java
index 6d03cc26d43..3d6722f0c6b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JavaTopLevelDataSetHandlerV2.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JavaTopLevelDataSetHandlerV2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonAsJavaDataSetRegistrationDropboxV2Wrapper.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonAsJavaDataSetRegistrationDropboxV2Wrapper.java
index 206891a2f0b..30d85421ec0 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonAsJavaDataSetRegistrationDropboxV2Wrapper.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonAsJavaDataSetRegistrationDropboxV2Wrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2;
 
 import org.apache.log4j.Logger;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonDataSetRegistrationServiceV2.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonDataSetRegistrationServiceV2.java
index 056764fca6d..e58fb8740a9 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonDataSetRegistrationServiceV2.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonDataSetRegistrationServiceV2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonTopLevelDataSetHandlerV2.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonTopLevelDataSetHandlerV2.java
index 9d5bef5ba6e..7a59efbb541 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonTopLevelDataSetHandlerV2.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/JythonTopLevelDataSetHandlerV2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/AbstractDataSetImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/AbstractDataSetImmutable.java
index 492cd2b08e9..5b3860cd83c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/AbstractDataSetImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/AbstractDataSetImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import java.util.Collection;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/AbstractTransactionState.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/AbstractTransactionState.java
index e04a64d0e08..26b17b67a6d 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/AbstractTransactionState.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/AbstractTransactionState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/AttachmentImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/AttachmentImmutable.java
index 2102882d37c..d50cccbdd11 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/AttachmentImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/AttachmentImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2.IAttachmentImmutable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/AuthorizationGroupImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/AuthorizationGroupImmutable.java
index 4d36769efc2..a964f8b7b9c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/AuthorizationGroupImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/AuthorizationGroupImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2.IAuthorizationGroupImmutable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/AuthorizationHelper.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/AuthorizationHelper.java
index 488411bfdc8..8bd542038a4 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/AuthorizationHelper.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/AuthorizationHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import java.util.HashSet;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/AuthorizationService.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/AuthorizationService.java
index 600d2e07ade..526b0da6d0f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/AuthorizationService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/AuthorizationService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/ConversionUtils.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/ConversionUtils.java
index abd8108cedf..122c43f41ee 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/ConversionUtils.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/ConversionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import java.util.Collection;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/DataSet.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/DataSet.java
index 564e6e35f25..57f35108176 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/DataSet.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/DataSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/DataSetImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/DataSetImmutable.java
index e2accaff283..70f3c98faf6 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/DataSetImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/DataSetImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/DataSetRegistrationTransaction.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/DataSetRegistrationTransaction.java
index 2a8fd514cee..4bc9a5ef481 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/DataSetRegistrationTransaction.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/DataSetRegistrationTransaction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/DataSetUpdatable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/DataSetUpdatable.java
index a926b7c6656..07d4df621b8 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/DataSetUpdatable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/DataSetUpdatable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/Experiment.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/Experiment.java
index fb24ccb8c9a..573ac921383 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/Experiment.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/Experiment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/ExperimentImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/ExperimentImmutable.java
index 3c0f1cd1f41..d4ca60ea509 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/ExperimentImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/ExperimentImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import java.util.Date;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/ExperimentUpdatable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/ExperimentUpdatable.java
index 661ed34da1e..6b3ab9e62d2 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/ExperimentUpdatable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/ExperimentUpdatable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/ExternalDataManagementSystem.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/ExternalDataManagementSystem.java
index 34501817816..43cc8775150 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/ExternalDataManagementSystem.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/ExternalDataManagementSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import ch.systemsx.cisd.etlserver.registrator.api.v2.IExternalDataManagementSystem;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/ExternalDataManagementSystemImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/ExternalDataManagementSystemImmutable.java
index ef28dd6c89f..bf73dbc1fdd 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/ExternalDataManagementSystemImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/ExternalDataManagementSystemImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2.IExternalDataManagementSystemImmutable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/Material.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/Material.java
index c1bd1e7f09f..ca9e248b18d 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/Material.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/Material.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/MaterialImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/MaterialImmutable.java
index 51eaa99fe1f..4a0ffac1db6 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/MaterialImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/MaterialImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/Metaproject.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/Metaproject.java
index d83949be6ca..c164c8dd1a9 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/Metaproject.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/Metaproject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import java.util.HashSet;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/MetaprojectAssignments.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/MetaprojectAssignments.java
index 1378e105e37..bf9ebbccadd 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/MetaprojectAssignments.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/MetaprojectAssignments.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import java.util.LinkedList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/MetaprojectImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/MetaprojectImmutable.java
index 965dac922a6..25c54d77a88 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/MetaprojectImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/MetaprojectImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2.IMetaprojectImmutable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/Project.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/Project.java
index f92370142b3..dbdc583b52a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/Project.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/Project.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/ProjectImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/ProjectImmutable.java
index ceaae270411..3974c3f771c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/ProjectImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/ProjectImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/PropertyAssignmentImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/PropertyAssignmentImmutable.java
index 42b9891b0f7..22776a9e6c1 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/PropertyAssignmentImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/PropertyAssignmentImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2.IPropertyAssignmentImmutable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/RoleAssignmentImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/RoleAssignmentImmutable.java
index 30be6ad6c36..d5ca69f6b6d 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/RoleAssignmentImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/RoleAssignmentImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2.IAuthorizationGroupImmutable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/Sample.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/Sample.java
index 9c9c58fcad7..95dd3232e30 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/Sample.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/Sample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/SampleImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/SampleImmutable.java
index 327881816b8..75cb4f5578d 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/SampleImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/SampleImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/SearchService.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/SearchService.java
index c2cbf832a1e..b642f4b432a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/SearchService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/SearchService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/Space.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/Space.java
index 830bd932b03..aca75cac830 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/Space.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/Space.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import ch.systemsx.cisd.etlserver.registrator.api.v2.ISpace;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/SpaceImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/SpaceImmutable.java
index 1be0777a482..e23db5b6c5e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/SpaceImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/SpaceImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/UserImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/UserImmutable.java
index 69b291b35fb..cd80d7bdcdc 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/UserImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/UserImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2.IUserImmutable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/Vocabulary.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/Vocabulary.java
index cdb32e5d176..418ed77541a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/Vocabulary.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/Vocabulary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import java.util.Collections;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/VocabularyImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/VocabularyImmutable.java
index 2f905b2ec4b..9f67edad206 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/VocabularyImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/VocabularyImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import java.util.LinkedList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/VocabularyTerm.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/VocabularyTerm.java
index f1ae5ffb880..665a9e4d6dc 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/VocabularyTerm.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/VocabularyTerm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import ch.systemsx.cisd.etlserver.registrator.api.v2.IVocabularyTerm;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/VocabularyTermImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/VocabularyTermImmutable.java
index 39fd241aedb..9ca6722f0ac 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/VocabularyTermImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/api/v2/impl/VocabularyTermImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2.impl;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2.IVocabularyTermImmutable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/monitor/DssRegistrationHealthMonitor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/monitor/DssRegistrationHealthMonitor.java
index d32f6d299c6..3c4e0c75934 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/monitor/DssRegistrationHealthMonitor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/monitor/DssRegistrationHealthMonitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.monitor;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/monitor/IDssRegistrationHealthMonitor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/monitor/IDssRegistrationHealthMonitor.java
index 78fed72f470..697a91dae7c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/monitor/IDssRegistrationHealthMonitor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/monitor/IDssRegistrationHealthMonitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.monitor;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/AbstractRecoveryState.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/AbstractRecoveryState.java
index d2d21fefd66..fc8d2897b7b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/AbstractRecoveryState.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/AbstractRecoveryState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.recovery;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/AutoRecoverySettings.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/AutoRecoverySettings.java
index e8b7f34c9b0..9a81cf65e98 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/AutoRecoverySettings.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/AutoRecoverySettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.recovery;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/ContainerRecoveryAlgorithm.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/ContainerRecoveryAlgorithm.java
index a3de89cd6ef..ec4ebcefb87 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/ContainerRecoveryAlgorithm.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/ContainerRecoveryAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.recovery;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStoragePrecommitRecoveryAlgorithm.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStoragePrecommitRecoveryAlgorithm.java
index 909edd7157a..77de4dd7ad1 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStoragePrecommitRecoveryAlgorithm.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStoragePrecommitRecoveryAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.recovery;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStoragePrecommitRecoveryState.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStoragePrecommitRecoveryState.java
index be1f055285f..4468cd7b517 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStoragePrecommitRecoveryState.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStoragePrecommitRecoveryState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.recovery;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageRecoveryAlgorithm.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageRecoveryAlgorithm.java
index 3f8e7e59d80..8474b99e530 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageRecoveryAlgorithm.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageRecoveryAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.recovery;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageRecoveryInfo.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageRecoveryInfo.java
index 3db9eac95e3..24809270a4f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageRecoveryInfo.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageRecoveryInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.recovery;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageRecoveryManager.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageRecoveryManager.java
index 8144066bba1..a512982490a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageRecoveryManager.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageRecoveryManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.recovery;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageStorageRecoveryState.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageStorageRecoveryState.java
index 17e465a10c8..0f57c48a67d 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageStorageRecoveryState.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageStorageRecoveryState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.recovery;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageStoredRecoveryAlgorithm.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageStoredRecoveryAlgorithm.java
index f8182b94d3f..ca4a8da257e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageStoredRecoveryAlgorithm.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/DataSetStorageStoredRecoveryAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.recovery;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/IDataSetStorageRecoveryAlgorithmWithState.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/IDataSetStorageRecoveryAlgorithmWithState.java
index 344227a75d7..91eb8f184bb 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/IDataSetStorageRecoveryAlgorithmWithState.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/IDataSetStorageRecoveryAlgorithmWithState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.recovery;
 
 import ch.systemsx.cisd.common.filesystem.IFileOperations;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/IDataSetStorageRecoveryManager.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/IDataSetStorageRecoveryManager.java
index b3be382511d..5373bf2a104 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/IDataSetStorageRecoveryManager.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/recovery/IDataSetStorageRecoveryManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.recovery;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/AbstractDataSetRegistrationDetailsFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/AbstractDataSetRegistrationDetailsFactory.java
index 688b1f7b8a7..2d97b2dbead 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/AbstractDataSetRegistrationDetailsFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/AbstractDataSetRegistrationDetailsFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/AbstractNoFileDataSetStorageAlgorithm.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/AbstractNoFileDataSetStorageAlgorithm.java
index ffada80d60f..31c7e0f5c0a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/AbstractNoFileDataSetStorageAlgorithm.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/AbstractNoFileDataSetStorageAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/AbstractOmniscientTopLevelDataSetRegistrator.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/AbstractOmniscientTopLevelDataSetRegistrator.java
index f6fc14be0c1..98278c0a2a4 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/AbstractOmniscientTopLevelDataSetRegistrator.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/AbstractOmniscientTopLevelDataSetRegistrator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v1;
 
 import static ch.systemsx.cisd.etlserver.IStorageProcessorTransactional.STORAGE_PROCESSOR_KEY;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/AbstractProgrammableTopLevelDataSetHandler.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/AbstractProgrammableTopLevelDataSetHandler.java
index a2e422a5cd4..2a35b520e30 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/AbstractProgrammableTopLevelDataSetHandler.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/AbstractProgrammableTopLevelDataSetHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/ConfiguredOnErrorActionDecision.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/ConfiguredOnErrorActionDecision.java
index efe061ec94e..cf1c11a2662 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/ConfiguredOnErrorActionDecision.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/ConfiguredOnErrorActionDecision.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v1;
 
 import java.util.Properties;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/ContainerDataSetStorageAlgorithm.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/ContainerDataSetStorageAlgorithm.java
index 56be4bfed18..06f339f3b83 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/ContainerDataSetStorageAlgorithm.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/ContainerDataSetStorageAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/DataSetRegistrationService.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/DataSetRegistrationService.java
index aec03942e3f..c5d86df3ea3 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/DataSetRegistrationService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/DataSetRegistrationService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/DataSetStorageAlgorithm.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/DataSetStorageAlgorithm.java
index 5fc3499cd84..d0166d15372 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/DataSetStorageAlgorithm.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/DataSetStorageAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/DataSetStorageAlgorithmRunner.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/DataSetStorageAlgorithmRunner.java
index d290005d703..010fd24a876 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/DataSetStorageAlgorithmRunner.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/DataSetStorageAlgorithmRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/DataSetStorageRollbacker.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/DataSetStorageRollbacker.java
index db244332347..2467f7bcd35 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/DataSetStorageRollbacker.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/DataSetStorageRollbacker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/DefaultDataSetRegistrationDetailsFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/DefaultDataSetRegistrationDetailsFactory.java
index f6e5b383282..c2ddc97666b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/DefaultDataSetRegistrationDetailsFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/DefaultDataSetRegistrationDetailsFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v1;
 
 import ch.systemsx.cisd.etlserver.registrator.v1.AbstractOmniscientTopLevelDataSetRegistrator.OmniscientTopLevelDataSetRegistratorState;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/DefaultEntityOperationService.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/DefaultEntityOperationService.java
index 3ae3b422c2a..f3e818ab38a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/DefaultEntityOperationService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/DefaultEntityOperationService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v1;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/IDataSetOnErrorActionDecision.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/IDataSetOnErrorActionDecision.java
index b3d347fe6ef..33d82375b82 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/IDataSetOnErrorActionDecision.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/IDataSetOnErrorActionDecision.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v1;
 
 import ch.systemsx.cisd.etlserver.IStorageProcessorTransactional.UnstoreDataAction;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/IDataSetRegistrationDetailsFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/IDataSetRegistrationDetailsFactory.java
index 53a2a3b89f4..865f0651d35 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/IDataSetRegistrationDetailsFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/IDataSetRegistrationDetailsFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/IDataSetRegistrationService.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/IDataSetRegistrationService.java
index 10f1d6d6371..bca3ea3057a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/IDataSetRegistrationService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/IDataSetRegistrationService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/IOmniscientEntityRegistrator.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/IOmniscientEntityRegistrator.java
index 263489f1ed2..b9c6ec902ad 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/IOmniscientEntityRegistrator.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/IOmniscientEntityRegistrator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/JythonTopLevelDataSetHandler.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/JythonTopLevelDataSetHandler.java
index 95d55b74a9d..0bb463840b8 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/JythonTopLevelDataSetHandler.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/JythonTopLevelDataSetHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/LinkDataSetStorageAlgorithm.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/LinkDataSetStorageAlgorithm.java
index d8e4a59beae..20fd7db24df 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/LinkDataSetStorageAlgorithm.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v1/LinkDataSetStorageAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/AbstractDataSetRegistrationDetailsFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/AbstractDataSetRegistrationDetailsFactory.java
index 5eb8bffad6b..9330f7f6505 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/AbstractDataSetRegistrationDetailsFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/AbstractDataSetRegistrationDetailsFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v2;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/AbstractNoFileDataSetStorageAlgorithm.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/AbstractNoFileDataSetStorageAlgorithm.java
index b5aabf1153f..d7b91452472 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/AbstractNoFileDataSetStorageAlgorithm.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/AbstractNoFileDataSetStorageAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v2;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/AbstractOmniscientTopLevelDataSetRegistrator.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/AbstractOmniscientTopLevelDataSetRegistrator.java
index 42db095967e..9de75518280 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/AbstractOmniscientTopLevelDataSetRegistrator.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/AbstractOmniscientTopLevelDataSetRegistrator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v2;
 
 import static ch.systemsx.cisd.etlserver.IStorageProcessorTransactional.STORAGE_PROCESSOR_KEY;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/AbstractProgrammableTopLevelDataSetHandler.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/AbstractProgrammableTopLevelDataSetHandler.java
index 3d36ad0d611..adf4ed5ca03 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/AbstractProgrammableTopLevelDataSetHandler.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/AbstractProgrammableTopLevelDataSetHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v2;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/ConfiguredOnErrorActionDecision.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/ConfiguredOnErrorActionDecision.java
index 779a9d6fa81..e837685eed0 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/ConfiguredOnErrorActionDecision.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/ConfiguredOnErrorActionDecision.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v2;
 
 import java.util.Properties;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/ContainerDataSetStorageAlgorithm.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/ContainerDataSetStorageAlgorithm.java
index ceb940deb80..f7179f1e096 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/ContainerDataSetStorageAlgorithm.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/ContainerDataSetStorageAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v2;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/DataSetRegistrationService.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/DataSetRegistrationService.java
index 89ec68a7454..23f7fb5ceaa 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/DataSetRegistrationService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/DataSetRegistrationService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v2;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/DataSetStorageAlgorithm.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/DataSetStorageAlgorithm.java
index 7aef7351498..c6d7ed15db2 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/DataSetStorageAlgorithm.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/DataSetStorageAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v2;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/DataSetStorageAlgorithmRunner.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/DataSetStorageAlgorithmRunner.java
index 6aa4afb35fd..dff7767adb0 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/DataSetStorageAlgorithmRunner.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/DataSetStorageAlgorithmRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v2;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/DataSetStorageRollbacker.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/DataSetStorageRollbacker.java
index 65266603b37..9c02f57c231 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/DataSetStorageRollbacker.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/DataSetStorageRollbacker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v2;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/DefaultDataSetRegistrationDetailsFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/DefaultDataSetRegistrationDetailsFactory.java
index 1e47654c315..e00f13d99df 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/DefaultDataSetRegistrationDetailsFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/DefaultDataSetRegistrationDetailsFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v2;
 
 import ch.systemsx.cisd.etlserver.registrator.v2.AbstractOmniscientTopLevelDataSetRegistrator.OmniscientTopLevelDataSetRegistratorState;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/DefaultEntityOperationService.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/DefaultEntityOperationService.java
index 177305a72bc..4efdd1e2bc9 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/DefaultEntityOperationService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/DefaultEntityOperationService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v2;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/IDataSetOnErrorActionDecision.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/IDataSetOnErrorActionDecision.java
index 46e91390265..8ea26b458e7 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/IDataSetOnErrorActionDecision.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/IDataSetOnErrorActionDecision.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v2;
 
 import ch.systemsx.cisd.etlserver.IStorageProcessorTransactional.UnstoreDataAction;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/IDataSetRegistrationDetailsFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/IDataSetRegistrationDetailsFactory.java
index 517adc04993..905def74203 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/IDataSetRegistrationDetailsFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/IDataSetRegistrationDetailsFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v2;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/IOmniscientEntityRegistrator.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/IOmniscientEntityRegistrator.java
index 7fedc212ff0..9bec9a0410f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/IOmniscientEntityRegistrator.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/IOmniscientEntityRegistrator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v2;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/LinkDataSetStorageAlgorithm.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/LinkDataSetStorageAlgorithm.java
index d63ef2227ec..7031b913b30 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/LinkDataSetStorageAlgorithm.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/registrator/v2/LinkDataSetStorageAlgorithm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.v2;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/threev/AbstractDataSetInfoExtractorFor3V.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/threev/AbstractDataSetInfoExtractorFor3V.java
index e1566c2c173..b2a65871afd 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/threev/AbstractDataSetInfoExtractorFor3V.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/threev/AbstractDataSetInfoExtractorFor3V.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.threev;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForDataAcquisition.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForDataAcquisition.java
index 94f58fe0691..64f7a603ec9 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForDataAcquisition.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForDataAcquisition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.threev;
 
 import java.util.Properties;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForImageAnalysis.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForImageAnalysis.java
index b8356644b2c..8f721459ca7 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForImageAnalysis.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForImageAnalysis.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.threev;
 
 import java.util.Collections;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/AbstractPreOrPostRegistrationExecutor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/AbstractPreOrPostRegistrationExecutor.java
index 19c01b7b281..faf37f62920 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/AbstractPreOrPostRegistrationExecutor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/AbstractPreOrPostRegistrationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.utils;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/Column.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/Column.java
index afefd73372e..abd9a1d3e73 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/Column.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/Column.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.utils;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/FileScanner.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/FileScanner.java
index b8199d62e90..5036fcd737a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/FileScanner.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/FileScanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.utils;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/MaintenanceTaskUtils.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/MaintenanceTaskUtils.java
index 5cdf18817d7..924da960632 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/MaintenanceTaskUtils.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/MaintenanceTaskUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.utils;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/PostRegistrationExecutor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/PostRegistrationExecutor.java
index caf143af646..c6bd38c1e47 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/PostRegistrationExecutor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/PostRegistrationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.utils;
 
 import org.apache.log4j.Logger;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/PreRegistrationExecutor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/PreRegistrationExecutor.java
index df67292b832..8e6c8329130 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/PreRegistrationExecutor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/PreRegistrationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.utils;
 
 import org.apache.log4j.Logger;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/PreprocessingExecutor.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/PreprocessingExecutor.java
index 4520ebe934a..191c89b9148 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/PreprocessingExecutor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/PreprocessingExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.utils;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/TabSeparatedValueTable.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/TabSeparatedValueTable.java
index 1b2e45391df..77818dc60d6 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/TabSeparatedValueTable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/TabSeparatedValueTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.utils;
 
 import java.io.Reader;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/TableBuilder.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/TableBuilder.java
index 00581bc7a15..e6307c3555b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/TableBuilder.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/TableBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.utils;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/Unzipper.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/Unzipper.java
index 203575ff76a..f06eb72db95 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/Unzipper.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/utils/Unzipper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.utils;
 
 import java.io.BufferedInputStream;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/AbstractValidator.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/AbstractValidator.java
index 0ed7e4be836..b9baee6a535 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/AbstractValidator.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/AbstractValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.validation;
 
 import java.util.Set;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/AbstractValidatorFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/AbstractValidatorFactory.java
index 37b10b40de0..4050f10f21e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/AbstractValidatorFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/AbstractValidatorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.validation;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/AnyValidatorFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/AnyValidatorFactory.java
index 2ebbc02cbc9..93dc06e0f55 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/AnyValidatorFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/AnyValidatorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.validation;
 
 final class AnyValidatorFactory implements IValidatorFactory
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/ColumnDefinition.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/ColumnDefinition.java
index f441fb24a11..807e5ec6d22 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/ColumnDefinition.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/ColumnDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.validation;
 
 import java.util.Properties;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/DataSetValidator.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/DataSetValidator.java
index 0c43f9a52a9..2386600b4c5 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/DataSetValidator.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/DataSetValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.validation;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/DataSetValidatorForTSV.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/DataSetValidatorForTSV.java
index 8cc6c2bcb35..46e7a59264f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/DataSetValidatorForTSV.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/DataSetValidatorForTSV.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.validation;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/DefaultValueValidatorFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/DefaultValueValidatorFactory.java
index ac048282b7a..c2f97b5053b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/DefaultValueValidatorFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/DefaultValueValidatorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.validation;
 
 import java.util.Properties;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/HeaderBasedValueValidatorFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/HeaderBasedValueValidatorFactory.java
index 71e07ec91cf..9afb1015aa9 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/HeaderBasedValueValidatorFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/HeaderBasedValueValidatorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.validation;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/IColumnHeaderValidator.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/IColumnHeaderValidator.java
index f554de1e61c..6c55c353263 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/IColumnHeaderValidator.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/IColumnHeaderValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.validation;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/IDataSetValidator.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/IDataSetValidator.java
index 3cd80d2c6c6..6247bccac1a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/IDataSetValidator.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/IDataSetValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.validation;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/IValidator.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/IValidator.java
index 4e2b3cf188d..a800f33bcac 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/IValidator.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/IValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.validation;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/IValidatorFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/IValidatorFactory.java
index d7861f605ed..419e2df24f9 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/IValidatorFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/IValidatorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.validation;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/NumericValidatorFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/NumericValidatorFactory.java
index 3b5c0915810..f66a6255abf 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/NumericValidatorFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/NumericValidatorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.validation;
 
 import java.util.Properties;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/RegExBasedValidator.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/RegExBasedValidator.java
index 492a355de97..98249463533 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/RegExBasedValidator.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/RegExBasedValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.validation;
 
 import java.util.Collections;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/Result.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/Result.java
index 3dcb5c290dc..4821459b684 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/Result.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/Result.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.validation;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/StringValidatorFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/StringValidatorFactory.java
index d577e25f8ff..5f8c25dc1f8 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/StringValidatorFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/StringValidatorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.validation;
 
 import java.util.Properties;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/UniqueGroupValidator.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/UniqueGroupValidator.java
index e758731ec43..e4588df1aa7 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/UniqueGroupValidator.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/UniqueGroupValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.validation;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/UniqueGroupValidatorFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/UniqueGroupValidatorFactory.java
index b31872f3916..a3cf4878e4b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/UniqueGroupValidatorFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/UniqueGroupValidatorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.validation;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/UniqueValidatorFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/UniqueValidatorFactory.java
index 04b5acf5cb2..aa03d5eea6f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/UniqueValidatorFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/etlserver/validation/UniqueValidatorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.validation;
 
 import java.util.HashSet;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/BuildAndEnvironmentInfo.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/BuildAndEnvironmentInfo.java
index 705c1e5f1bf..966b89c308d 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/BuildAndEnvironmentInfo.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/BuildAndEnvironmentInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss;
 
 import ch.systemsx.cisd.base.utilities.AbstractBuildAndEnvironmentInfo;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/BatchResult.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/BatchResult.java
index d2d19bf12c0..b9bc800eddd 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/BatchResult.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/BatchResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.archiveverifier.batch;
 
 import java.util.Collection;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/DataSetArchiveVerificationResult.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/DataSetArchiveVerificationResult.java
index 1800c38b54a..e9738c2400d 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/DataSetArchiveVerificationResult.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/DataSetArchiveVerificationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.archiveverifier.batch;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/DataSetArchiveVerifier.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/DataSetArchiveVerifier.java
index 46ce75a5f14..cce76b7cf88 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/DataSetArchiveVerifier.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/DataSetArchiveVerifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.archiveverifier.batch;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/IArchiveFileRepository.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/IArchiveFileRepository.java
index d9927d27c04..44c1b082997 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/IArchiveFileRepository.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/IArchiveFileRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.archiveverifier.batch;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/IArchiveFileVerifier.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/IArchiveFileVerifier.java
index f4579e98a54..cd2b8119da3 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/IArchiveFileVerifier.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/IArchiveFileVerifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.archiveverifier.batch;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/IDataSetArchiveVerificationBatch.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/IDataSetArchiveVerificationBatch.java
index 652f5699423..9bdede67bd0 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/IDataSetArchiveVerificationBatch.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/IDataSetArchiveVerificationBatch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.archiveverifier.batch;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/IDataSetArchiveVerifier.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/IDataSetArchiveVerifier.java
index 7db5ef5c039..e2d8d3b1b99 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/IDataSetArchiveVerifier.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/IDataSetArchiveVerifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.archiveverifier.batch;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/ResultType.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/ResultType.java
index 0c1285855dd..58573696032 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/ResultType.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/ResultType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.archiveverifier.batch;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/SerialDataSetArchiveVerificationBatch.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/SerialDataSetArchiveVerificationBatch.java
index 1f872cb6a55..7781f45a46e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/SerialDataSetArchiveVerificationBatch.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/SerialDataSetArchiveVerificationBatch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.archiveverifier.batch;
 
 import java.util.Collection;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/VerificationError.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/VerificationError.java
index a9358ed1196..c2148ca0014 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/VerificationError.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/VerificationError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.archiveverifier.batch;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/VerificationErrorType.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/VerificationErrorType.java
index 5136d2a20e2..16116a86150 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/VerificationErrorType.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/VerificationErrorType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.archiveverifier.batch;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/cli/DataSetArchiveVerificationBatchFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/cli/DataSetArchiveVerificationBatchFactory.java
index 3d0a1afce17..289d3404d40 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/cli/DataSetArchiveVerificationBatchFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/cli/DataSetArchiveVerificationBatchFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.archiveverifier.cli;
 
 import java.io.BufferedReader;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/cli/Main.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/cli/Main.java
index f050e9e7dca..8ada03708cb 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/cli/Main.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/cli/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.archiveverifier.cli;
 
 import ch.systemsx.cisd.openbis.dss.archiveverifier.batch.BatchResult;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/cli/ResultPrinter.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/cli/ResultPrinter.java
index 332a5daecb2..2f259491445 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/cli/ResultPrinter.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/cli/ResultPrinter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.archiveverifier.cli;
 
 import java.io.PrintStream;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/filesystem/FileSystemArchiveFileRepository.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/filesystem/FileSystemArchiveFileRepository.java
index 77db83e3fd5..c85cfa78d11 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/filesystem/FileSystemArchiveFileRepository.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/filesystem/FileSystemArchiveFileRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.archiveverifier.filesystem;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/filesystem/FlatFileLocator.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/filesystem/FlatFileLocator.java
index 05f71233b76..75d01db7d0b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/filesystem/FlatFileLocator.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/filesystem/FlatFileLocator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.archiveverifier.filesystem;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/filesystem/IFileLocator.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/filesystem/IFileLocator.java
index 4f17fa01c5b..999c3d96863 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/filesystem/IFileLocator.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/filesystem/IFileLocator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.archiveverifier.filesystem;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/filesystem/ShardingFileLocator.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/filesystem/ShardingFileLocator.java
index aabd9e50e6a..d947b0e5f8c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/filesystem/ShardingFileLocator.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/filesystem/ShardingFileLocator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.archiveverifier.filesystem;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/pathinfo/DataSetPathInfo.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/pathinfo/DataSetPathInfo.java
index 9bc44b72f5a..2aac58ea255 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/pathinfo/DataSetPathInfo.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/pathinfo/DataSetPathInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.archiveverifier.pathinfo;
 
 import java.util.Map;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/pathinfo/JdbcPathInfoRepository.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/pathinfo/JdbcPathInfoRepository.java
index 5f442dd8753..0e99a8fc99c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/pathinfo/JdbcPathInfoRepository.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/pathinfo/JdbcPathInfoRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.archiveverifier.pathinfo;
 
 import java.sql.Connection;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/pathinfo/PathInfoEntry.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/pathinfo/PathInfoEntry.java
index 5d7271b05fc..3c172170432 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/pathinfo/PathInfoEntry.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/pathinfo/PathInfoEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.archiveverifier.pathinfo;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/AbstractZipFileVerifier.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/AbstractZipFileVerifier.java
index 842e7b3e0bf..02396c3f780 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/AbstractZipFileVerifier.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/AbstractZipFileVerifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.archiveverifier.verifier;
 
 import java.io.BufferedInputStream;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/CompositeVerifier.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/CompositeVerifier.java
index 15284977973..c648712663a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/CompositeVerifier.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/CompositeVerifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.archiveverifier.verifier;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/CrcEnabled.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/CrcEnabled.java
index 0ebbb759b41..28b9755dd1a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/CrcEnabled.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/CrcEnabled.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.archiveverifier.verifier;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/IArchiveFileContent.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/IArchiveFileContent.java
index 551aac5af97..4e328691f30 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/IArchiveFileContent.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/IArchiveFileContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.archiveverifier.verifier;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/IArchiveFileMetaDataRepository.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/IArchiveFileMetaDataRepository.java
index ee3eba1029b..0d13633efb8 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/IArchiveFileMetaDataRepository.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/IArchiveFileMetaDataRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.archiveverifier.verifier;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/ZipFileHeaderVerifier.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/ZipFileHeaderVerifier.java
index 5dd36480565..30fe8adbc6f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/ZipFileHeaderVerifier.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/ZipFileHeaderVerifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.archiveverifier.verifier;
 
 import static ch.systemsx.cisd.common.io.IOUtilities.crc32ToString;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/ZipFileIntegrityVerifier.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/ZipFileIntegrityVerifier.java
index e0a94f39af9..888c0334ad6 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/ZipFileIntegrityVerifier.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/ZipFileIntegrityVerifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.archiveverifier.verifier;
 
 import static ch.systemsx.cisd.common.io.IOUtilities.crc32ToString;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/admin/AbstractCommand.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/admin/AbstractCommand.java
index e1818e2d993..37c9780d4ca 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/admin/AbstractCommand.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/admin/AbstractCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.admin;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/admin/CommonArguments.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/admin/CommonArguments.java
index e830122154e..0193ff9fe36 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/admin/CommonArguments.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/admin/CommonArguments.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.admin;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/admin/IShareManagerApplicationCommand.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/admin/IShareManagerApplicationCommand.java
index be578e1ae04..0d1fab49296 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/admin/IShareManagerApplicationCommand.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/admin/IShareManagerApplicationCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.admin;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.v1.IDssServiceRpcGeneric;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/admin/ListSharesCommand.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/admin/ListSharesCommand.java
index 275e6e6f2e1..9a12c248b6b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/admin/ListSharesCommand.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/admin/ListSharesCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.admin;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/admin/MoveDataSetsCommand.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/admin/MoveDataSetsCommand.java
index 10b2e2504bc..7baefd7143b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/admin/MoveDataSetsCommand.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/admin/MoveDataSetsCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.admin;
 
 import java.util.Collections;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/admin/ShareManagerApplication.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/admin/ShareManagerApplication.java
index a8500d6af2a..d5dbfc1c6d0 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/admin/ShareManagerApplication.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/admin/ShareManagerApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.admin;
 
 import java.util.HashMap;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/AbstractClient.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/AbstractClient.java
index 275924f85d4..ada1ac89232 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/AbstractClient.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/AbstractClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.cli;
 
 import java.net.SocketException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/AbstractCommand.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/AbstractCommand.java
index 4ec70974121..d93472c9fb6 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/AbstractCommand.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/AbstractCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.cli;
 
 import java.io.PrintStream;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/AbstractCommandFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/AbstractCommandFactory.java
index d0dc14d0593..9b72ad3bb39 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/AbstractCommandFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/AbstractCommandFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.cli;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/AbstractDataSetExecutor.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/AbstractDataSetExecutor.java
index c157468d1ea..673711650f7 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/AbstractDataSetExecutor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/AbstractDataSetExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.cli;
 
 import ch.systemsx.cisd.openbis.dss.client.api.v1.IDataSetDss;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/AbstractDssCommand.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/AbstractDssCommand.java
index 461202c0013..3bff91aec04 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/AbstractDssCommand.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/AbstractDssCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.cli;
 
 import ch.systemsx.cisd.openbis.dss.client.api.v1.DssComponentFactory;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/AbstractExecutor.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/AbstractExecutor.java
index dee9e11f598..0b5259a8717 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/AbstractExecutor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/AbstractExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.cli;
 
 import ch.systemsx.cisd.args4j.CmdLineParser;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandGet.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandGet.java
index 7d794fc9e6d..0b0a188262b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandGet.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandGet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.cli;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandHelp.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandHelp.java
index dc8d39708d6..b943986962a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandHelp.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandHelp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.cli;
 
 import java.io.PrintStream;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandLs.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandLs.java
index 76315197c5f..229d0bbaa11 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandLs.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandLs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.cli;
 
 import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandPut.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandPut.java
index 79a9aebb9c4..a21caef9f34 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandPut.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandPut.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.cli;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandTestExtractMetadata.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandTestExtractMetadata.java
index 8fdfceb976d..e3c5311cbd7 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandTestExtractMetadata.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandTestExtractMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.cli;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandTestValid.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandTestValid.java
index ad967b578a0..d8bd995da29 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandTestValid.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandTestValid.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.cli;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CompositeCommandFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CompositeCommandFactory.java
index 64beabd463d..b5de08a432c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CompositeCommandFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CompositeCommandFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.cli;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/DataSetArguments.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/DataSetArguments.java
index 31185966933..ddebe89ea0f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/DataSetArguments.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/DataSetArguments.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.cli;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/DssClient.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/DssClient.java
index fd23907134a..23786daab0a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/DssClient.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/DssClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.cli;
 
 import ch.systemsx.cisd.common.utilities.SystemExit;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/DssCommandFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/DssCommandFactory.java
index 37c4b33b1c1..8c987d38bf0 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/DssCommandFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/DssCommandFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.cli;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/GlobalArguments.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/GlobalArguments.java
index a3e23d0565e..1df3c10f67d 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/GlobalArguments.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/GlobalArguments.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.cli;
 
 import org.apache.commons.lang3.time.DateUtils;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/ICommand.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/ICommand.java
index a55fe61d2b7..3a6fd6b0e73 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/ICommand.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/ICommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.cli;
 
 import java.io.PrintStream;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/ICommandFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/ICommandFactory.java
index 2969fe6569e..32f02308b92 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/ICommandFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/ICommandFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.cli;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/ResultCode.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/ResultCode.java
index 8831abdd367..bdb2fcf5d10 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/ResultCode.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/cli/ResultCode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.cli;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/AbstractEntityPickerDialog.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/AbstractEntityPickerDialog.java
index 9f2f98c1cc1..a04d9c9ba2c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/AbstractEntityPickerDialog.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/AbstractEntityPickerDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui;
 
 import java.awt.BorderLayout;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/AbstractEntityPickerPanel.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/AbstractEntityPickerPanel.java
index e838d295fbb..4bd86050a53 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/AbstractEntityPickerPanel.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/AbstractEntityPickerPanel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 /*
  * Copyright 2011 ETH Zuerich, CISD
  *
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/AbstractSwingGUI.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/AbstractSwingGUI.java
index 756a1f5dcbf..0a7a4cc628d 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/AbstractSwingGUI.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/AbstractSwingGUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui;
 
 import java.awt.Frame;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/AbstractTreeEntityPickerDialog.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/AbstractTreeEntityPickerDialog.java
index cf1bf8892c3..923fb7f03de 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/AbstractTreeEntityPickerDialog.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/AbstractTreeEntityPickerDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui;
 
 import java.awt.Point;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/AddVocabularyTermDialog.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/AddVocabularyTermDialog.java
index 165a8177ff4..5a8745f049c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/AddVocabularyTermDialog.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/AddVocabularyTermDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui;
 
 import java.awt.BorderLayout;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/AsyncNodeAction.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/AsyncNodeAction.java
index 60027e7e13a..e4a89c025ac 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/AsyncNodeAction.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/AsyncNodeAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui;
 
 import java.awt.BorderLayout;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/ColumnSortingListener.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/ColumnSortingListener.java
index 22843a4f448..76f45511731 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/ColumnSortingListener.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/ColumnSortingListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui;
 
 import java.awt.event.MouseAdapter;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetMetadataPanel.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetMetadataPanel.java
index 7827e43e413..83f0552843d 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetMetadataPanel.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetMetadataPanel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui;
 
 import static ch.systemsx.cisd.openbis.dss.client.api.gui.DataSetUploadClient.BUTTON_HEIGHT;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetPickerDialog.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetPickerDialog.java
index 2553824dce0..25844059856 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetPickerDialog.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetPickerDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetPickerPanel.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetPickerPanel.java
index c2f357673ad..2004ebb982b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetPickerPanel.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetPickerPanel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui;
 
 import java.awt.event.ActionEvent;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetPropertiesPanel.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetPropertiesPanel.java
index 7f57067831a..c436145b628 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetPropertiesPanel.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetPropertiesPanel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui;
 
 import static ch.systemsx.cisd.openbis.dss.client.api.gui.DataSetUploadClient.BUTTON_HEIGHT;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetUploadClient.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetUploadClient.java
index eb12cd64169..68a2ac3fd73 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetUploadClient.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetUploadClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui;
 
 import static ch.systemsx.cisd.common.utilities.SystemTimeProvider.SYSTEM_TIME_PROVIDER;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetUploadClientLoginForm.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetUploadClientLoginForm.java
index d016148e466..7d8d0fe48e1 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetUploadClientLoginForm.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetUploadClientLoginForm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/ErrorMessageDialog.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/ErrorMessageDialog.java
index 4a1ef0a663e..9d0e869cbe7 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/ErrorMessageDialog.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/ErrorMessageDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui;
 
 import java.awt.Point;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/ErrorsPanel.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/ErrorsPanel.java
index 3300e21355b..2c607e11ba7 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/ErrorsPanel.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/ErrorsPanel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui;
 
 import java.awt.CardLayout;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/ExperimentPickerDialog.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/ExperimentPickerDialog.java
index d995de4e3aa..c2615d62a5c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/ExperimentPickerDialog.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/ExperimentPickerDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui;
 
 import java.awt.Dimension;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/ExperimentPickerPanel.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/ExperimentPickerPanel.java
index 59fd70e8c7a..6d2c210517f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/ExperimentPickerPanel.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/ExperimentPickerPanel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui;
 
 import java.awt.event.ActionEvent;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/IProgressListener.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/IProgressListener.java
index 162bb066226..a13439f3eb2 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/IProgressListener.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/IProgressListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/SamplePickerDialog.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/SamplePickerDialog.java
index be06696239e..1f8d6cbea9c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/SamplePickerDialog.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/SamplePickerDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/SamplePickerPanel.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/SamplePickerPanel.java
index 86c19fb53f1..93b331a978c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/SamplePickerPanel.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/SamplePickerPanel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui;
 
 import java.awt.event.ActionEvent;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/UiUtilities.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/UiUtilities.java
index 03cfa90eab2..aa8c36dd755 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/UiUtilities.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/UiUtilities.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui;
 
 import java.awt.BorderLayout;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/UploadStatusTableCellEditor.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/UploadStatusTableCellEditor.java
index aedae26204a..2df2c333f44 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/UploadStatusTableCellEditor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/UploadStatusTableCellEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui;
 
 import java.awt.Component;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/UploadStatusTableCellRenderer.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/UploadStatusTableCellRenderer.java
index fdee3d801b3..4a23c71644b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/UploadStatusTableCellRenderer.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/UploadStatusTableCellRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui;
 
 import java.awt.Color;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/VocabularyTermsComboBoxPanel.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/VocabularyTermsComboBoxPanel.java
index c8a1da93541..d123a70c00b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/VocabularyTermsComboBoxPanel.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/VocabularyTermsComboBoxPanel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui;
 
 import java.awt.BorderLayout;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/DataSetUploadClientModel.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/DataSetUploadClientModel.java
index f02564db000..dd18bce29cf 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/DataSetUploadClientModel.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/DataSetUploadClientModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui.model;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/DataSetUploadOperation.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/DataSetUploadOperation.java
index 7b9e6cf2f4f..c9f0712e72d 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/DataSetUploadOperation.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/DataSetUploadOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui.model;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/DataSetUploadTableModel.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/DataSetUploadTableModel.java
index 954fb7cf64f..745aef363ce 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/DataSetUploadTableModel.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/DataSetUploadTableModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui.model;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/DssCommunicationState.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/DssCommunicationState.java
index ac2e840576e..179caeb3d2b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/DssCommunicationState.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/DssCommunicationState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui.model;
 
 import org.apache.commons.lang3.time.DateUtils;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/IAsyncAction.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/IAsyncAction.java
index 3fa33bfb2b6..11869201e1a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/IAsyncAction.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/IAsyncAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui.model;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/IUserNotifier.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/IUserNotifier.java
index a52f2822026..697dc900b4a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/IUserNotifier.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/IUserNotifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui.model;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/Identifier.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/Identifier.java
index 366849b6059..d2e13d306f0 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/Identifier.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/Identifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui.model;
 
 import ch.systemsx.cisd.openbis.dss.client.api.v1.DataSet;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/SamplesDataSets.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/SamplesDataSets.java
index 4d72bb62c72..9d21fbd3002 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/SamplesDataSets.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/SamplesDataSets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui.model;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/SortableFilterableTableModel.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/SortableFilterableTableModel.java
index 0818d29d64e..e46c7314e87 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/SortableFilterableTableModel.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/SortableFilterableTableModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui.model;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/UploadClientSortingUtils.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/UploadClientSortingUtils.java
index 695a9648d3e..19f048dce11 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/UploadClientSortingUtils.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/UploadClientSortingUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui.model;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/ValidatedFile.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/ValidatedFile.java
index 465df1310a0..06389866084 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/ValidatedFile.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/model/ValidatedFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui.model;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/table/BevelArrowIcon.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/table/BevelArrowIcon.java
index 623fb96828a..2b84f9e8631 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/table/BevelArrowIcon.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/table/BevelArrowIcon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui.table;
 
 import java.awt.Color;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/table/SortButtonRenderer.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/table/SortButtonRenderer.java
index 77be13567ec..1eb6916ab11 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/table/SortButtonRenderer.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/table/SortButtonRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui.table;
 
 import java.awt.Component;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/table/TableHeaderMouseListener.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/table/TableHeaderMouseListener.java
index 7ba35e10c9a..22eacc0c1c2 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/table/TableHeaderMouseListener.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/table/TableHeaderMouseListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui.table;
 
 import java.awt.Rectangle;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/tree/FilterableMutableTreeNode.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/tree/FilterableMutableTreeNode.java
index 0040dfe9f98..a66f68dc61e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/tree/FilterableMutableTreeNode.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/tree/FilterableMutableTreeNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.gui.tree;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/DataSet.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/DataSet.java
index 8616e2055e8..3046aa0fa26 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/DataSet.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/DataSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/DssComponentFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/DssComponentFactory.java
index b30891ab92f..25159eb70bc 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/DssComponentFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/DssComponentFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.v1;
 
 import ch.systemsx.cisd.openbis.common.api.client.ServiceFinder;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/FileInfoDssDownloader.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/FileInfoDssDownloader.java
index 8d6f1c3b388..feedd84d05c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/FileInfoDssDownloader.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/FileInfoDssDownloader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/IDataSetDss.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/IDataSetDss.java
index 095ace09080..7e4a987dd20 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/IDataSetDss.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/IDataSetDss.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/IDssComponent.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/IDssComponent.java
index 82741a90a78..2cbace54a77 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/IDssComponent.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/IDssComponent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/IOpenbisServiceFacade.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/IOpenbisServiceFacade.java
index c98158fc8e3..e7e9597eef3 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/IOpenbisServiceFacade.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/IOpenbisServiceFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.v1;
 
 import java.util.EnumSet;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/IOpenbisServiceFacadeFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/IOpenbisServiceFacadeFactory.java
index 7c3c749c2cd..7e77e46731e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/IOpenbisServiceFacadeFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/IOpenbisServiceFacadeFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.v1;
 
 import ch.systemsx.cisd.openbis.dss.client.api.v1.impl.OpenbisServiceFacade;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/ISimpleOpenbisServiceFacade.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/ISimpleOpenbisServiceFacade.java
index 0221a209d69..7e3efa83637 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/ISimpleOpenbisServiceFacade.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/ISimpleOpenbisServiceFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/OpenbisServiceFacadeFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/OpenbisServiceFacadeFactory.java
index 338bca760ad..557e2e37caf 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/OpenbisServiceFacadeFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/OpenbisServiceFacadeFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.v1;
 
 import ch.systemsx.cisd.openbis.dss.client.api.v1.impl.OpenbisServiceFacade;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DataSetDss.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DataSetDss.java
index 16b06d8066e..706ef210c02 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DataSetDss.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DataSetDss.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.v1.impl;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponent.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponent.java
index 83882367d58..d708f234e54 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponent.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.v1.impl;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssServiceRpcFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssServiceRpcFactory.java
index 4419bac847b..f28dc1b64b1 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssServiceRpcFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssServiceRpcFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.v1.impl;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/OpenbisServiceFacade.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/OpenbisServiceFacade.java
index cab18eadbc4..2fa56b847f2 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/OpenbisServiceFacade.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/OpenbisServiceFacade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.v1.impl;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v3/IOpenbisServiceFacadeV3.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v3/IOpenbisServiceFacadeV3.java
index 394d0df88ff..ca7036c1a2d 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v3/IOpenbisServiceFacadeV3.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v3/IOpenbisServiceFacadeV3.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.v3;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchResult;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v3/OpenbisServiceFacadeV3.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v3/OpenbisServiceFacadeV3.java
index 4b25d21161a..feaedadc5ac 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v3/OpenbisServiceFacadeV3.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/client/api/v3/OpenbisServiceFacadeV3.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.v3;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.IApplicationServerApi;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/DataStoreServer.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/DataStoreServer.java
index 6d6b597251f..0282aa37151 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/DataStoreServer.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/DataStoreServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDataSetDescriptionBasedCommand.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDataSetDescriptionBasedCommand.java
index d9d8209d804..27de1ea7820 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDataSetDescriptionBasedCommand.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDataSetDescriptionBasedCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDataSetLocationBasedCommand.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDataSetLocationBasedCommand.java
index e4c6eb8ece5..ad568b1a740 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDataSetLocationBasedCommand.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDataSetLocationBasedCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDataSetPackager.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDataSetPackager.java
index f0fa3eb906d..8b7c5bbec16 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDataSetPackager.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDataSetPackager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.ByteArrayInputStream;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDatasetDownloadServlet.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDatasetDownloadServlet.java
index fab1180ff0d..f40a59f68b4 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDatasetDownloadServlet.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDatasetDownloadServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.awt.image.BufferedImage;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDssServiceRpc.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDssServiceRpc.java
index 0ed7ab16f86..f14ebaacff1 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDssServiceRpc.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDssServiceRpc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractTabularDataGraphServlet.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractTabularDataGraphServlet.java
index 943c57823d3..55b622b3c5b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractTabularDataGraphServlet.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractTabularDataGraphServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ApplicationContext.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ApplicationContext.java
index 228b3dc11a9..ef2a218f0aa 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ApplicationContext.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AutoResolveUtils.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AutoResolveUtils.java
index eac404b77cf..a19de88f06b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AutoResolveUtils.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AutoResolveUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/CIFEXRPCServiceFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/CIFEXRPCServiceFactory.java
index 50c9c7d1599..ee9b4683445 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/CIFEXRPCServiceFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/CIFEXRPCServiceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import ch.systemsx.cisd.cifex.rpc.client.ICIFEXComponent;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/CommandInfo.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/CommandInfo.java
index cd6b3ca4be4..119fac0bcaa 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/CommandInfo.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/CommandInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/CommandQueueInfo.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/CommandQueueInfo.java
index 8a6c2434766..86165b41e92 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/CommandQueueInfo.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/CommandQueueInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/CommandQueueLister.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/CommandQueueLister.java
index c8812c52fd3..864aae659e6 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/CommandQueueLister.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/CommandQueueLister.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ConfigParameters.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ConfigParameters.java
index 07e0e2af38a..0331a101947 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ConfigParameters.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ConfigParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataSetCommandExecutor.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataSetCommandExecutor.java
index 03695eb0de6..fea126a3863 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataSetCommandExecutor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataSetCommandExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java
index 2c1f5e15a6a..9a26c7f3dc0 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.GenericSharedConstants.DATA_STORE_SERVER_SERVICE_NAME;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServerJythonEvaluatorSpringComponent.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServerJythonEvaluatorSpringComponent.java
index 45794541cbd..4426fb14831 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServerJythonEvaluatorSpringComponent.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServerJythonEvaluatorSpringComponent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, SIS
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import org.apache.log4j.Logger;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreService.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreService.java
index 98675fd0217..84180bb771f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServiceLogger.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServiceLogger.java
index dab48cc1e08..75ce4ea13a8 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServiceLogger.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServiceLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatabaseBasedDataSetPathInfoProvider.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatabaseBasedDataSetPathInfoProvider.java
index c893a59230f..3fc4a5da862 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatabaseBasedDataSetPathInfoProvider.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatabaseBasedDataSetPathInfoProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetAuthorizationCache.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetAuthorizationCache.java
index dd9feecca8d..1c188a34b27 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetAuthorizationCache.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetAuthorizationCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.util.Iterator;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServlet.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServlet.java
index abea0b2ce79..7b29629cb64 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServlet.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.GenericSharedConstants.DATA_STORE_SERVER_WEB_APPLICATION_NAME;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetImageOverviewConfiguration.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetImageOverviewConfiguration.java
index 648c0bc0550..495364d3619 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetImageOverviewConfiguration.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetImageOverviewConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.util.HashMap;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetImageOverviewServlet.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetImageOverviewServlet.java
index ee4b6e309af..bd825c41167 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetImageOverviewServlet.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetImageOverviewServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.IOException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetSessionAuthorizer.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetSessionAuthorizer.java
index dce0073b841..6c5110f53d6 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetSessionAuthorizer.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetSessionAuthorizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DeletionCommand.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DeletionCommand.java
index d14593c914a..a7e992675be 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DeletionCommand.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DeletionCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DirectoryRendererUtil.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DirectoryRendererUtil.java
index 498f9e4d4f8..bfdff556ac2 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DirectoryRendererUtil.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DirectoryRendererUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import org.apache.commons.io.FileUtils;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcAuthorizationAdvisor.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcAuthorizationAdvisor.java
index fe6a66e785f..ba130ab1b1e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcAuthorizationAdvisor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcAuthorizationAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.IOException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DynamicFileTabularDataGraphServlet.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DynamicFileTabularDataGraphServlet.java
index eb5cc5c5706..3fda21eb124 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DynamicFileTabularDataGraphServlet.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DynamicFileTabularDataGraphServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.util.Enumeration;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedFilteredBasicOpenBISService.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedFilteredBasicOpenBISService.java
index f56cf61d444..64396096bfd 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedFilteredBasicOpenBISService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedFilteredBasicOpenBISService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.util.Collection;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java
index d1397c22441..b91272f2b43 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.ByteArrayInputStream;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/FileTabularDataGraphServlet.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/FileTabularDataGraphServlet.java
index 43949fa5312..daeacd42376 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/FileTabularDataGraphServlet.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/FileTabularDataGraphServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/HTMLErrorRenderer.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/HTMLErrorRenderer.java
index 41fc11622ae..445bb662d5d 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/HTMLErrorRenderer.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/HTMLErrorRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.PrintWriter;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/HTMLMessageRenderer.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/HTMLMessageRenderer.java
index 49869814810..d001bcf09bf 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/HTMLMessageRenderer.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/HTMLMessageRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.PrintWriter;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/HttpInvokerServlet.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/HttpInvokerServlet.java
index 7025367f03c..14aac381dd8 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/HttpInvokerServlet.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/HttpInvokerServlet.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.IOException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ICIFEXRPCServiceFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ICIFEXRPCServiceFactory.java
index 65c310c054b..aef929025cb 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ICIFEXRPCServiceFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ICIFEXRPCServiceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.Serializable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IDataSetCommand.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IDataSetCommand.java
index c2f00d440f6..25544ed01b3 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IDataSetCommand.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IDataSetCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.Serializable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IDataSetCommandExecutor.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IDataSetCommandExecutor.java
index 28fb7c63581..8b2545cb460 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IDataSetCommandExecutor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IDataSetCommandExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IDataSetCommandExecutorFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IDataSetCommandExecutorFactory.java
index 11fa7ea9ecd..cdc87f219bc 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IDataSetCommandExecutorFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IDataSetCommandExecutorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IDataSetCommandExecutorProvider.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IDataSetCommandExecutorProvider.java
index 5902cd2bbc1..78df73387ca 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IDataSetCommandExecutorProvider.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IDataSetCommandExecutorProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IDataSetFileOperationsExecutor.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IDataSetFileOperationsExecutor.java
index 5ee914f6d61..fcbd0c9ebc9 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IDataSetFileOperationsExecutor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IDataSetFileOperationsExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IDatasetImageOverviewPlugin.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IDatasetImageOverviewPlugin.java
index 4e000dd8c7c..71e004b9e4f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IDatasetImageOverviewPlugin.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IDatasetImageOverviewPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContent;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IDirectoryRenderer.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IDirectoryRenderer.java
index ce5ce17c2a8..3b17599e847 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IDirectoryRenderer.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IDirectoryRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IErrorRenderer.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IErrorRenderer.java
index e7a3f044ee0..66ece2e3d3f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IErrorRenderer.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IErrorRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IMessageRenderer.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IMessageRenderer.java
index 2144f9249ec..de6c871e28f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IMessageRenderer.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IMessageRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 public interface IMessageRenderer extends IWriterInjector
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IRendererFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IRendererFactory.java
index db7cff56c5a..50cf7cc9ab0 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IRendererFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IRendererFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IServiceConversationClientManagerLocal.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IServiceConversationClientManagerLocal.java
index 1cae780189f..4b20d03676d 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IServiceConversationClientManagerLocal.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IServiceConversationClientManagerLocal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import ch.systemsx.cisd.openbis.generic.shared.IServiceForDataStoreServer;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IServiceConversationServerManagerLocal.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IServiceConversationServerManagerLocal.java
index 00d00717f13..31676cb1f4d 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IServiceConversationServerManagerLocal.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IServiceConversationServerManagerLocal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IServletPropertiesManager.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IServletPropertiesManager.java
index 40763ba77b5..4df73d0e72c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IServletPropertiesManager.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IServletPropertiesManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.util.Properties;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IStreamRepository.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IStreamRepository.java
index 7eb932d0815..3aabbf2507f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IStreamRepository.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IStreamRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.InputStream;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IWriterInjector.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IWriterInjector.java
index 4cecc078244..b26ba54fb1c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IWriterInjector.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IWriterInjector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.PrintWriter;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IdentifiedStreamHandlingServlet.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IdentifiedStreamHandlingServlet.java
index 0d709e1c6f0..321acadc65e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IdentifiedStreamHandlingServlet.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IdentifiedStreamHandlingServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.IOException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/InputStreamWithPath.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/InputStreamWithPath.java
index 43ddb219d72..172f911509b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/InputStreamWithPath.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/InputStreamWithPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.InputStream;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/KeyBasedDataSetCommandExecutorProvider.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/KeyBasedDataSetCommandExecutorProvider.java
index 11d372653c9..f7028ee6e1b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/KeyBasedDataSetCommandExecutorProvider.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/KeyBasedDataSetCommandExecutorProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, SIS
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/LocalDataSetFileOperationsExcecutor.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/LocalDataSetFileOperationsExcecutor.java
index 783e09ef688..253a596f6f6 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/LocalDataSetFileOperationsExcecutor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/LocalDataSetFileOperationsExcecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/OpenbisSessionTokenCache.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/OpenbisSessionTokenCache.java
index 1f42c41298d..3682cd8b064 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/OpenbisSessionTokenCache.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/OpenbisSessionTokenCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.util.HashSet;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/PlainTextRendererFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/PlainTextRendererFactory.java
index b436b33ad94..7b6f1a75694 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/PlainTextRendererFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/PlainTextRendererFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.PrintWriter;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ProcessDatasetsCommand.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ProcessDatasetsCommand.java
index 9bb3a660ace..55748a669aa 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ProcessDatasetsCommand.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ProcessDatasetsCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/RemoteDataSetFileOperationsExecutor.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/RemoteDataSetFileOperationsExecutor.java
index 8bf0ac55d6f..f4603ee05c1 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/RemoteDataSetFileOperationsExecutor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/RemoteDataSetFileOperationsExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/RenderingContext.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/RenderingContext.java
index ca18b907541..f172e63a486 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/RenderingContext.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/RenderingContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ResponseContentStream.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ResponseContentStream.java
index e04eb1b7aea..59bb40f5c35 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ResponseContentStream.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ResponseContentStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.awt.image.BufferedImage;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ServiceConversationClientManager.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ServiceConversationClientManager.java
index 1c9ed916484..5a38fcaf6cc 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ServiceConversationClientManager.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ServiceConversationClientManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import ch.systemsx.cisd.common.spring.PropertyPlaceholderUtils;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ServiceConversationServerManager.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ServiceConversationServerManager.java
index e592152a3f5..f0a1e470ef7 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ServiceConversationServerManager.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ServiceConversationServerManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import org.springframework.beans.factory.InitializingBean;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SessionTokenManager.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SessionTokenManager.java
index 7b3b35abedb..f24cc46ded9 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SessionTokenManager.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SessionTokenManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SessionWorkspaceFileDownloadServlet.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SessionWorkspaceFileDownloadServlet.java
index 4de71e6d3b4..8d9f029c3a5 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SessionWorkspaceFileDownloadServlet.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SessionWorkspaceFileDownloadServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.IOException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SessionWorkspaceFileUploadServlet.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SessionWorkspaceFileUploadServlet.java
index 0f16735ec5e..078200a98d0 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SessionWorkspaceFileUploadServlet.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SessionWorkspaceFileUploadServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SessionWorkspaceFormUploadServlet.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SessionWorkspaceFormUploadServlet.java
index 98b85c4c344..5ab0b009b7b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SessionWorkspaceFormUploadServlet.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SessionWorkspaceFormUploadServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.IOException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SessionWorkspaceProvider.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SessionWorkspaceProvider.java
index 162e2264e27..966d284e6a2 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SessionWorkspaceProvider.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SessionWorkspaceProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ShareIdManager.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ShareIdManager.java
index 1aaea3cce77..ddf1c9afb15 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ShareIdManager.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ShareIdManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SimpleHTMLDirectoryRenderer.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SimpleHTMLDirectoryRenderer.java
index 81c5caaeef9..681d6c8cab1 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SimpleHTMLDirectoryRenderer.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SimpleHTMLDirectoryRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.PrintWriter;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SimpleHTMLRendererFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SimpleHTMLRendererFactory.java
index 531b38fd05d..2f1970bfb64 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SimpleHTMLRendererFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SimpleHTMLRendererFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/StreamRepository.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/StreamRepository.java
index faf46c1753d..fd3294d43c4 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/StreamRepository.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/StreamRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.InputStream;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/TarDataSetPackager.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/TarDataSetPackager.java
index d19271abc41..433ea3954fa 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/TarDataSetPackager.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/TarDataSetPackager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/UploadingCommand.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/UploadingCommand.java
index 7c8694bd050..77cd8b8f6ca 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/UploadingCommand.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/UploadingCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/Utils.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/Utils.java
index 74c37bdb096..ca14f9b3116 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/Utils.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/Utils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import javax.activation.MimetypesFileTypeMap;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ZipDataSetPackager.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ZipDataSetPackager.java
index 29793446577..082ee6f169f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ZipDataSetPackager.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ZipDataSetPackager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/DssServiceRpcGeneric.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/DssServiceRpcGeneric.java
index 73751b6d1f6..a43bf35c188 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/DssServiceRpcGeneric.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/DssServiceRpcGeneric.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.api.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/DssServiceRpcGenericLogger.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/DssServiceRpcGenericLogger.java
index 26c10fa231d..2f880bdb28f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/DssServiceRpcGenericLogger.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/DssServiceRpcGenericLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.api.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v2/sequencedatabases/AbstractSearchDomainService.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v2/sequencedatabases/AbstractSearchDomainService.java
index d660f89951a..d4e6a37cf7d 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v2/sequencedatabases/AbstractSearchDomainService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v2/sequencedatabases/AbstractSearchDomainService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, SIS
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.api.v2.sequencedatabases;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v2/sequencedatabases/BlastDatabase.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v2/sequencedatabases/BlastDatabase.java
index c1215c19800..7174f34cf2e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v2/sequencedatabases/BlastDatabase.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v2/sequencedatabases/BlastDatabase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, SIS
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.api.v2.sequencedatabases;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v2/sequencedatabases/EchoDatabase.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v2/sequencedatabases/EchoDatabase.java
index a7470f5aba3..74a27f204cb 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v2/sequencedatabases/EchoDatabase.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v2/sequencedatabases/EchoDatabase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, SIS
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.api.v2.sequencedatabases;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v2/sequencedatabases/FileSearchDomain.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v2/sequencedatabases/FileSearchDomain.java
index 8cc295dcce4..4abc6e730dc 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v2/sequencedatabases/FileSearchDomain.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v2/sequencedatabases/FileSearchDomain.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.openbis.dss.generic.server.api.v2.sequencedatabases;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/dbbackup/BackupDatabaseDescriptionGenerator.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/dbbackup/BackupDatabaseDescriptionGenerator.java
index 89894ec9915..2f44b5070e7 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/dbbackup/BackupDatabaseDescriptionGenerator.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/dbbackup/BackupDatabaseDescriptionGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.dbbackup;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/dbbackup/BackupDatabaseParser.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/dbbackup/BackupDatabaseParser.java
index 86fc54f22fc..611ea3edcca 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/dbbackup/BackupDatabaseParser.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/dbbackup/BackupDatabaseParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.dbbackup;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/FtpPathResolverRegistry.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/FtpPathResolverRegistry.java
index 878636265c3..9c8dbe6642f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/FtpPathResolverRegistry.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/FtpPathResolverRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.fs;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/ResolverContext.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/ResolverContext.java
index 6251a83539a..3b0e2a40252 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/ResolverContext.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/ResolverContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, CISD
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.fs;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.IApplicationServerApi;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/api/IResolver.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/api/IResolver.java
index dba0ba9aab1..a682e21f157 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/api/IResolver.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/api/IResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, CISD
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.fs.api;
 
 import ch.systemsx.cisd.openbis.dss.generic.server.fs.api.file.IFileSystemViewResponse;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/api/IResolverContext.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/api/IResolverContext.java
index fac56481a03..5e9ae6022d9 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/api/IResolverContext.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/api/IResolverContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, CISD
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.fs.api;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.IApplicationServerApi;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/api/IResolverPlugin.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/api/IResolverPlugin.java
index 810104f6d77..b462925a48f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/api/IResolverPlugin.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/api/IResolverPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.fs.api;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/api/file/IDirectoryResponse.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/api/file/IDirectoryResponse.java
index a5c1f33b4c9..d8340ae99f0 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/api/file/IDirectoryResponse.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/api/file/IDirectoryResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, CISD
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.fs.api.file;
 
 import java.util.Date;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/api/file/IFileSystemViewResponse.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/api/file/IFileSystemViewResponse.java
index 14869af2823..891345d7076 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/api/file/IFileSystemViewResponse.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/api/file/IFileSystemViewResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.fs.api.file;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/file/DirectoryResponse.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/file/DirectoryResponse.java
index 1d769088f91..077c4fed578 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/file/DirectoryResponse.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/file/DirectoryResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, CISD
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.fs.file;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/file/FileResponse.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/file/FileResponse.java
index 9aa3410b92b..ff74969f4eb 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/file/FileResponse.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/file/FileResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, CISD
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.fs.file;
 
 import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContent;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/file/NonExistingFileResponse.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/file/NonExistingFileResponse.java
index 9dcc0861771..53b85a38e9c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/file/NonExistingFileResponse.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/file/NonExistingFileResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.fs.file;
 
 import ch.systemsx.cisd.openbis.dss.generic.server.fs.api.file.IFileSystemViewResponse;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/plugins/DataSetTypeResolver.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/plugins/DataSetTypeResolver.java
index 681ebb61993..f170d60b613 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/plugins/DataSetTypeResolver.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/plugins/DataSetTypeResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, CISD
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.fs.plugins;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/plugins/FileSystemPlugin.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/plugins/FileSystemPlugin.java
index de13799dc62..45ef24f771d 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/plugins/FileSystemPlugin.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/plugins/FileSystemPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, CISD
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.fs.plugins;
 
 import ch.systemsx.cisd.openbis.dss.generic.server.fs.api.IResolverPlugin;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/plugins/JythonResolver.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/plugins/JythonResolver.java
index 9013fad1d1e..b89c43959b9 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/plugins/JythonResolver.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/plugins/JythonResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, CISD
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.fs.plugins;
 
 import java.util.HashMap;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/plugins/SampleTypeResolver.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/plugins/SampleTypeResolver.java
index b0232a34d55..91a74ca5c2d 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/plugins/SampleTypeResolver.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/plugins/SampleTypeResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, CISD
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.fs.plugins;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/AbstractResolver.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/AbstractResolver.java
index 1d565eee7fa..00bd6802326 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/AbstractResolver.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/AbstractResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.fs.resolver;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.Sample;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/DataSetContentResolver.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/DataSetContentResolver.java
index fce377e89bd..f5b392dc4b2 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/DataSetContentResolver.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/DataSetContentResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, CISD
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.fs.resolver;
 
 import java.util.Collections;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/ExperimentLevelResolver.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/ExperimentLevelResolver.java
index c700d1861b7..f75bdc0ef21 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/ExperimentLevelResolver.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/ExperimentLevelResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, CISD
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.fs.resolver;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/HierarchicalContentResolver.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/HierarchicalContentResolver.java
index 0072191d2ff..83fbea099e4 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/HierarchicalContentResolver.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/HierarchicalContentResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, CISD
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.fs.resolver;
 
 import ch.systemsx.cisd.common.shared.basic.string.StringUtils;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/ProjectLevelResolver.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/ProjectLevelResolver.java
index bc0bc9b6192..c2e97ac161c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/ProjectLevelResolver.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/ProjectLevelResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, CISD
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.fs.resolver;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/RootLevelResolver.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/RootLevelResolver.java
index 57a0e811bd4..f9a42e5fca7 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/RootLevelResolver.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/RootLevelResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, CISD
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.fs.resolver;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/SampleLevelResolver.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/SampleLevelResolver.java
index b9d1fe86f53..98c65cb8da6 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/SampleLevelResolver.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/SampleLevelResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 ETH Zuerich, SIS
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.fs.resolver;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/SpaceLevelResolver.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/SpaceLevelResolver.java
index c0e6100d502..06fed960b0c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/SpaceLevelResolver.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/fs/resolver/SpaceLevelResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, CISD
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.fs.resolver;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/Cache.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/Cache.java
index 157e7b401d9..65257bcbb68 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/Cache.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/Cache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp;
 
 import java.util.HashMap;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/DSSFileSystemView.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/DSSFileSystemView.java
index 7e1202f2764..b31a40d6cb3 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/DSSFileSystemView.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/DSSFileSystemView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp;
 
 import java.lang.reflect.InvocationHandler;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpConstants.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpConstants.java
index 8616dc1be02..2e8898b06f8 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpConstants.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpFileFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpFileFactory.java
index 86175907072..4e4cd2bc0ae 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpFileFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpFileFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp;
 
 import org.apache.ftpserver.ftplet.FtpFile;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpPathResolverConfig.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpPathResolverConfig.java
index d6e67f568e5..780299287a4 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpPathResolverConfig.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpPathResolverConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, SIS
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp;
 
 import java.util.Collections;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpPathResolverContext.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpPathResolverContext.java
index 9d135011b44..409c7b6ee63 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpPathResolverContext.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpPathResolverContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpPathResolverRegistry.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpPathResolverRegistry.java
index 92ab079277b..8fadf6e1391 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpPathResolverRegistry.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpPathResolverRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpServer.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpServer.java
index 813fdc78431..95070868161 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpServer.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpServerConfig.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpServerConfig.java
index c3c5c890617..f9541cb1724 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpServerConfig.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpServerConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpUser.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpUser.java
index 2093beaf6b8..d7e339715a2 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpUser.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpUser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp;
 
 import java.util.Collections;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpUserManager.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpUserManager.java
index 5d8b986e67e..fa2608f7dcf 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpUserManager.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/FtpUserManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp;
 
 import java.util.Collections;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/IFtpPathResolver.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/IFtpPathResolver.java
index 262b4e501e7..514b7b9c189 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/IFtpPathResolver.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/IFtpPathResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp;
 
 import org.apache.ftpserver.ftplet.FtpFile;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/IFtpPathResolverRegistry.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/IFtpPathResolverRegistry.java
index a68d0081fc8..832668a2f15 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/IFtpPathResolverRegistry.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/IFtpPathResolverRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp;
 
 import org.apache.ftpserver.ftplet.FtpFile;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/Node.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/Node.java
index 92fa3744325..84bce3314d7 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/Node.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/Node.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/NonExistingFtpFile.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/NonExistingFtpFile.java
index 6f286cc5ab9..c250966c563 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/NonExistingFtpFile.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/NonExistingFtpFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, SIS
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp;
 
 import java.io.IOException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/AbstractFtpFile.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/AbstractFtpFile.java
index 9e372f60283..18350dee2d7 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/AbstractFtpFile.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/AbstractFtpFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp.resolver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/AbstractFtpFileWithContent.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/AbstractFtpFileWithContent.java
index ee20c0d2984..1ca222fef3f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/AbstractFtpFileWithContent.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/AbstractFtpFileWithContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp.resolver;
 
 import java.io.IOException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/AbstractFtpFolder.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/AbstractFtpFolder.java
index 4fc7343f5c7..565f0553266 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/AbstractFtpFolder.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/AbstractFtpFolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp.resolver;
 
 import java.io.IOException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/ExperimentFolderResolver.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/ExperimentFolderResolver.java
index 3345244627e..4bdb5716e01 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/ExperimentFolderResolver.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/ExperimentFolderResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp.resolver;
 
 import java.util.Collections;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/FtpFileEvaluationContext.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/FtpFileEvaluationContext.java
index a98a87de601..9d1d93e97d9 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/FtpFileEvaluationContext.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/FtpFileEvaluationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp.resolver;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/FtpFileImpl.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/FtpFileImpl.java
index 7df33543cf0..17d7d75f97d 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/FtpFileImpl.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/FtpFileImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp.resolver;
 
 import java.io.IOException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/IExperimentChildrenLister.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/IExperimentChildrenLister.java
index 6a4afb02d71..cb4832457d9 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/IExperimentChildrenLister.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/IExperimentChildrenLister.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp.resolver;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/ProjectFolderResolver.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/ProjectFolderResolver.java
index b1677f9eebd..ceee323af49 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/ProjectFolderResolver.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/ProjectFolderResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp.resolver;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/RootFolderResolver.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/RootFolderResolver.java
index 6e9b0add9ab..1a289988d3b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/RootFolderResolver.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/RootFolderResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp.resolver;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/SpaceFolderResolver.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/SpaceFolderResolver.java
index 37a7c2745ca..13ab90c963c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/SpaceFolderResolver.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/SpaceFolderResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp.resolver;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/TemplateBasedDataSetResourceResolver.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/TemplateBasedDataSetResourceResolver.java
index 21fd3d55598..9a088efb515 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/TemplateBasedDataSetResourceResolver.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/TemplateBasedDataSetResourceResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp.resolver;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/AbstractTabularDataGraph.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/AbstractTabularDataGraph.java
index d0662021a4a..5966fddd677 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/AbstractTabularDataGraph.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/AbstractTabularDataGraph.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.graph;
 
 import java.awt.Color;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/HeatmapDataset.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/HeatmapDataset.java
index 58ebde8fa4f..79f20ef7d43 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/HeatmapDataset.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/HeatmapDataset.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.graph;
 
 import org.jfree.data.DomainOrder;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/ITabularDataGraph.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/ITabularDataGraph.java
index a12028e5df0..e3806b42ebc 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/ITabularDataGraph.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/ITabularDataGraph.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.graph;
 
 import java.io.IOException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/SpreadsheetColumnTickUnit.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/SpreadsheetColumnTickUnit.java
index 2e36820d5da..23c372e4c52 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/SpreadsheetColumnTickUnit.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/SpreadsheetColumnTickUnit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.graph;
 
 import org.jfree.chart.axis.NumberTickUnit;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphCollectionConfiguration.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphCollectionConfiguration.java
index dbea60c35af..545eeb5565a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphCollectionConfiguration.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphCollectionConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.graph;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphConfiguration.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphConfiguration.java
index 4d5db818c51..328f24c2549 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphConfiguration.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.graph;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.CodeAndLabel;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmap.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmap.java
index 973dafcce77..5ec2ac007dd 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmap.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.graph;
 
 import java.awt.Color;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmapConfiguration.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmapConfiguration.java
index 7398c302dfb..eed7b693b43 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmapConfiguration.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmapConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.graph;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.CodeAndLabel;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogram.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogram.java
index bd0b4bd02cd..34fc57320fa 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogram.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogram.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.graph;
 
 import java.io.OutputStream;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogramConfiguration.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogramConfiguration.java
index f99854ce636..edfa911f319 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogramConfiguration.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogramConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.graph;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.CodeAndLabel;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplot.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplot.java
index 0c5b0d7a7bd..4b14eaefe27 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplot.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplot.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.graph;
 
 import java.awt.Shape;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplotConfiguration.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplotConfiguration.java
index 9336d81a119..2a5ad6ee443 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplotConfiguration.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplotConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.graph;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.CodeAndLabel;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataTickUnit.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataTickUnit.java
index 2f9021ed31c..aeb5308dbfb 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataTickUnit.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataTickUnit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.graph;
 
 import java.text.DecimalFormat;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataTickUnitSource.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataTickUnitSource.java
index fca01841bf2..479216a0e1f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataTickUnitSource.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataTickUnitSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.graph;
 
 import java.io.Serializable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/AnonymousAuthenticationHandler.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/AnonymousAuthenticationHandler.java
index 73a97056cce..a9d84880aea 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/AnonymousAuthenticationHandler.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/AnonymousAuthenticationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2015 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.oaipmh;
 
 import java.util.Properties;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/BasicHttpAuthenticationHandler.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/BasicHttpAuthenticationHandler.java
index e31c8e3fafe..da07bd61971 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/BasicHttpAuthenticationHandler.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/BasicHttpAuthenticationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.oaipmh;
 
 import java.io.IOException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/IAuthenticationHandler.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/IAuthenticationHandler.java
index bd398151020..2f12da30d61 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/IAuthenticationHandler.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/IAuthenticationHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.oaipmh;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/IConfigurable.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/IConfigurable.java
index a11608c2881..5b6dcdd9b47 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/IConfigurable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/IConfigurable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.oaipmh;
 
 import java.util.Properties;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/IRequestHandler.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/IRequestHandler.java
index d07daadaa7a..6ec36930478 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/IRequestHandler.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/IRequestHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.oaipmh;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/JythonBasedRequestHandler.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/JythonBasedRequestHandler.java
index c81a72e9976..c889216e064 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/JythonBasedRequestHandler.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/JythonBasedRequestHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.oaipmh;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/OaipmhServlet.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/OaipmhServlet.java
index 8e231923cb4..7a2faac4148 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/OaipmhServlet.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/OaipmhServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.oaipmh;
 
 import java.io.IOException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/xoai/SimpleItem.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/xoai/SimpleItem.java
index d2a8cc5a43f..a0a0485e626 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/xoai/SimpleItem.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/xoai/SimpleItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.oaipmh.xoai;
 
 import java.util.LinkedList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/xoai/SimpleItemIdentifier.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/xoai/SimpleItemIdentifier.java
index f8711a5ebed..4004c25b4e8 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/xoai/SimpleItemIdentifier.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/xoai/SimpleItemIdentifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.oaipmh.xoai;
 
 import java.util.Date;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/xoai/SimpleItemRepository.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/xoai/SimpleItemRepository.java
index 729d1bccebe..0fd675904df 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/xoai/SimpleItemRepository.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/xoai/SimpleItemRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.oaipmh.xoai;
 
 import java.util.Date;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/xoai/SimpleSetRepository.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/xoai/SimpleSetRepository.java
index 162d1692467..86d9f03496d 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/xoai/SimpleSetRepository.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/oaipmh/xoai/SimpleSetRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.oaipmh.xoai;
 
 import java.util.LinkedList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/openbisauth/OpenBISAuthenticationAdvisor.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/openbisauth/OpenBISAuthenticationAdvisor.java
index c91f254493a..8448ba33eb9 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/openbisauth/OpenBISAuthenticationAdvisor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/openbisauth/OpenBISAuthenticationAdvisor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.openbisauth;
 
 import org.springframework.aop.ClassFilter;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/openbisauth/OpenBISAuthenticationInterceptor.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/openbisauth/OpenBISAuthenticationInterceptor.java
index babde6bc4a0..6d569c87224 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/openbisauth/OpenBISAuthenticationInterceptor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/openbisauth/OpenBISAuthenticationInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.openbisauth;
 
 import org.aopalliance.intercept.MethodInterceptor;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/pat/PersonalAccessTokenConfigFromEncapsulatedService.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/pat/PersonalAccessTokenConfigFromEncapsulatedService.java
index 007a3a5e1ca..5bb6603f814 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/pat/PersonalAccessTokenConfigFromEncapsulatedService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/pat/PersonalAccessTokenConfigFromEncapsulatedService.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2022 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.openbis.dss.generic.server.pat;
 
 import java.util.Map;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/pat/PersonalAccessTokenConverterFromEncapsulatedService.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/pat/PersonalAccessTokenConverterFromEncapsulatedService.java
index 0b77b293f9a..4eaad596622 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/pat/PersonalAccessTokenConverterFromEncapsulatedService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/pat/PersonalAccessTokenConverterFromEncapsulatedService.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2022 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.openbis.dss.generic.server.pat;
 
 import java.util.Collections;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/FileBasedImageAnalysisGraphReportingPlugin.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/FileBasedImageAnalysisGraphReportingPlugin.java
index a44ca575aaa..73914cfbb8a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/FileBasedImageAnalysisGraphReportingPlugin.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/FileBasedImageAnalysisGraphReportingPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DatasetModificationReportingPlugin.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DatasetModificationReportingPlugin.java
index 881d3d0ac16..1933f775c72 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DatasetModificationReportingPlugin.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DatasetModificationReportingPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.demo;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoArchiver.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoArchiver.java
index f9dd1438159..f91d705e569 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoArchiver.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoArchiver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.demo;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoOverviewPlugin.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoOverviewPlugin.java
index a6244704869..46d360aa134 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoOverviewPlugin.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoOverviewPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.demo;
 
 import java.awt.Color;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoProcessingPlugin.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoProcessingPlugin.java
index d43929f9d3f..3155968baff 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoProcessingPlugin.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoProcessingPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.demo;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoReportingPlugin.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoReportingPlugin.java
index 0628ec71f61..900763a7736 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoReportingPlugin.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/demo/DemoReportingPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.demo;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/EmailSender.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/EmailSender.java
index 4fad16c0dbc..a2ee9448ca7 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/EmailSender.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/EmailSender.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython;
 
 import java.io.IOException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IAggregationServiceReportingPluginScriptRunner.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IAggregationServiceReportingPluginScriptRunner.java
index 4ed479b504d..a84d269b5f4 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IAggregationServiceReportingPluginScriptRunner.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IAggregationServiceReportingPluginScriptRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython;
 
 import java.util.Map;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IDbModifyingAggregationServiceReportingPluginScriptRunner.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IDbModifyingAggregationServiceReportingPluginScriptRunner.java
index e9fc7922732..18fffc48e7a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IDbModifyingAggregationServiceReportingPluginScriptRunner.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IDbModifyingAggregationServiceReportingPluginScriptRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython;
 
 import java.util.Map;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IPluginScriptRunnerFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IPluginScriptRunnerFactory.java
index b1f252817f7..9899a8fb79f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IPluginScriptRunnerFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IPluginScriptRunnerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython;
 
 import java.io.Serializable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IProcessingPluginScriptRunner.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IProcessingPluginScriptRunner.java
index ba411af08da..39a5713424f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IProcessingPluginScriptRunner.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IProcessingPluginScriptRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython;
 
 import ch.systemsx.cisd.common.exceptions.Status;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IReportingPluginScriptRunner.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IReportingPluginScriptRunner.java
index 720a7dfd921..3909fa6b6f0 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IReportingPluginScriptRunner.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IReportingPluginScriptRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IRequestHandlerPluginScriptRunner.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IRequestHandlerPluginScriptRunner.java
index 24f0484b565..6041a05b69e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IRequestHandlerPluginScriptRunner.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/IRequestHandlerPluginScriptRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/ITableModelCreator.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/ITableModelCreator.java
index c5600568269..8c56f27f012 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/ITableModelCreator.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/ITableModelCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModel;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonAggregationService.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonAggregationService.java
index 47bdc1a0002..a8cd462f9f2 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonAggregationService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonAggregationService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedPluginUtils.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedPluginUtils.java
index ef0513f4e66..d676ebc1c43 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedPluginUtils.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedPluginUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedProcessingPlugin.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedProcessingPlugin.java
index c3118b7dd64..9d85e6e5706 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedProcessingPlugin.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedProcessingPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedReportingPlugin.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedReportingPlugin.java
index c9d267ebd4a..b8dcc7d8a37 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedReportingPlugin.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedReportingPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonIngestionService.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonIngestionService.java
index ae4d5cc4b8c..afdb36ef7b7 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonIngestionService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonIngestionService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/MailService.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/MailService.java
index d02a59e7208..731daa0f028 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/MailService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/MailService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython;
 
 import java.io.FileNotFoundException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunnerFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunnerFactory.java
index 1a9ba1b4733..abb8d1e7146 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunnerFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunnerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython;
 
 import java.util.HashMap;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/ReportingBasedProcessingPlugin.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/ReportingBasedProcessingPlugin.java
index 04d45345b89..6796a0049ee 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/ReportingBasedProcessingPlugin.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/ReportingBasedProcessingPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/SimpleTableModelBuilderAdaptor.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/SimpleTableModelBuilderAdaptor.java
index 6c02b001934..c5700c5b0cd 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/SimpleTableModelBuilderAdaptor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/SimpleTableModelBuilderAdaptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython;
 
 import java.util.Date;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/Utils.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/Utils.java
index 92849994834..336dae6149d 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/Utils.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/Utils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython;
 
 import org.apache.log4j.Logger;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/api/IDataSet.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/api/IDataSet.java
index 5b1a797d589..e37216cc5f3 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/api/IDataSet.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/api/IDataSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython.api;
 
 import java.util.Date;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/api/IEmailSender.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/api/IEmailSender.java
index 8bd4b51e089..c41e51f864c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/api/IEmailSender.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/api/IEmailSender.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython.api;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/api/IMailService.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/api/IMailService.java
index 6db8ec868c1..e92516a5f4d 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/api/IMailService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/api/IMailService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython.api;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractArchiverProcessingPlugin.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractArchiverProcessingPlugin.java
index aa2c8f5267d..6698c055ae3 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractArchiverProcessingPlugin.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractArchiverProcessingPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetArchivingStatus.ARCHIVED;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDataMergingReportingPlugin.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDataMergingReportingPlugin.java
index 0052f0e9ba7..a92a66d6448 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDataMergingReportingPlugin.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDataMergingReportingPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDatastorePlugin.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDatastorePlugin.java
index e8d5fa56dd0..af04568cd41 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDatastorePlugin.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDatastorePlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDropboxProcessingPlugin.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDropboxProcessingPlugin.java
index 06c23e81d08..f757e2f2a59 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDropboxProcessingPlugin.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDropboxProcessingPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDssLinkReportingPlugin.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDssLinkReportingPlugin.java
index bc160210971..5e15776f5fd 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDssLinkReportingPlugin.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDssLinkReportingPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractFileTableReportingPlugin.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractFileTableReportingPlugin.java
index af4a3e752c7..9ebf367856a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractFileTableReportingPlugin.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractFileTableReportingPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractPackageManager.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractPackageManager.java
index 86fc9411e1f..1f4565fb2da 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractPackageManager.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractPackageManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, SIS
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractTableModelReportingPlugin.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractTableModelReportingPlugin.java
index c0330eba5fc..6331e44cdb9 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractTableModelReportingPlugin.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractTableModelReportingPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AggregationService.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AggregationService.java
index 44f2b59cc6a..97b493facb2 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AggregationService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AggregationService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ArchivingAggregationService.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ArchivingAggregationService.java
index fc1ece59663..cb6adabc936 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ArchivingAggregationService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ArchivingAggregationService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/Copier.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/Copier.java
index 1744977bc9e..faf09d78cdd 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/Copier.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/Copier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetAndPathInfoDBConsistencyCheckProcessingPlugin.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetAndPathInfoDBConsistencyCheckProcessingPlugin.java
index 7299556992e..b1c635e07c2 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetAndPathInfoDBConsistencyCheckProcessingPlugin.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetAndPathInfoDBConsistencyCheckProcessingPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetCopier.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetCopier.java
index fdb0b177867..7a3018d5a8c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetCopier.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetCopier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetCopierForUsers.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetCopierForUsers.java
index 96af8389966..18ea71c0de4 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetCopierForUsers.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetCopierForUsers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import static ch.systemsx.cisd.openbis.generic.shared.Constants.USER_PARAMETER;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetFileOperationsManager.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetFileOperationsManager.java
index 62f38ecd31f..5471a11d2ba 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetFileOperationsManager.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetFileOperationsManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DecoratingTableModelReportingPlugin.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DecoratingTableModelReportingPlugin.java
index a5c05aaae14..2f93d8aaa2e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DecoratingTableModelReportingPlugin.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DecoratingTableModelReportingPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DistributedPackagingDataSetFileOperationsManager.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DistributedPackagingDataSetFileOperationsManager.java
index eea01d80ad0..60bf7f81e02 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DistributedPackagingDataSetFileOperationsManager.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DistributedPackagingDataSetFileOperationsManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/EntityLinksDecorator.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/EntityLinksDecorator.java
index 4a1d65bcab0..01d01331bf3 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/EntityLinksDecorator.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/EntityLinksDecorator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/FileBasedPause.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/FileBasedPause.java
index 76c0fb40994..935820d1eee 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/FileBasedPause.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/FileBasedPause.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, SIS
+ * Copyright ETH 2015 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/GenericDssLinkReportingPlugin.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/GenericDssLinkReportingPlugin.java
index 9edb8f67953..61f55350247 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/GenericDssLinkReportingPlugin.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/GenericDssLinkReportingPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/HighWaterMarkChecker.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/HighWaterMarkChecker.java
index eba63843fdd..3772aa2a74b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/HighWaterMarkChecker.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/HighWaterMarkChecker.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IDataSetFileOperationsManager.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IDataSetFileOperationsManager.java
index ebe165a95ce..ef461896aa3 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IDataSetFileOperationsManager.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IDataSetFileOperationsManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IDataSetFileOperationsManagerFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IDataSetFileOperationsManagerFactory.java
index d8cd361963a..f3f2694947a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IDataSetFileOperationsManagerFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IDataSetFileOperationsManagerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.Serializable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IImmutableCopierFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IImmutableCopierFactory.java
index a51f287a9ba..de8353bc52c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IImmutableCopierFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IImmutableCopierFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IPackageManager.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IPackageManager.java
index 5319a1d10cf..3103b27b8ee 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IPackageManager.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IPackageManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IPathCopierFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IPathCopierFactory.java
index dc020f35b69..5d0848c0191 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IPathCopierFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IPathCopierFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ISshCommandExecutorFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ISshCommandExecutorFactory.java
index eea8d56dea2..3f15253db7a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ISshCommandExecutorFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ISshCommandExecutorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IStatusChecker.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IStatusChecker.java
index 8096fe2a0e4..223d90bd995 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IStatusChecker.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IStatusChecker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import ch.systemsx.cisd.common.exceptions.Status;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ImmutableCopierFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ImmutableCopierFactory.java
index 72b9e205f51..8597bf2dba3 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ImmutableCopierFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ImmutableCopierFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IngestionService.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IngestionService.java
index 2a246f34c9d..cf084fc5cd7 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IngestionService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IngestionService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MergedColumnDataReportingPlugin.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MergedColumnDataReportingPlugin.java
index 0d0970e2541..4c5161240ca 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MergedColumnDataReportingPlugin.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MergedColumnDataReportingPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MergedRowDataReportingPlugin.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MergedRowDataReportingPlugin.java
index 74f489b2ba8..ff79e661d92 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MergedRowDataReportingPlugin.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MergedRowDataReportingPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/RsyncArchiveCopierFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/RsyncArchiveCopierFactory.java
index ee16c3641bf..ca8dec97065 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/RsyncArchiveCopierFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/RsyncArchiveCopierFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/RsyncArchiver.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/RsyncArchiver.java
index 54917ef4637..f09c023f560 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/RsyncArchiver.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/RsyncArchiver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/RsyncCopierFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/RsyncCopierFactory.java
index 866eedefa26..b5dc45de865 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/RsyncCopierFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/RsyncCopierFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/SshCommandExecutorFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/SshCommandExecutorFactory.java
index 96c13ecbb76..12c0f5b8dc4 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/SshCommandExecutorFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/SshCommandExecutorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/TSVViewReportingPlugin.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/TSVViewReportingPlugin.java
index 7f12e18412e..78e84439e41 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/TSVViewReportingPlugin.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/TSVViewReportingPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/TarArchiver.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/TarArchiver.java
index fe8ed76c3e5..7168c442c58 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/TarArchiver.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/TarArchiver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/TarBasedPathInfoProvider.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/TarBasedPathInfoProvider.java
index 105f88b4862..1ad07b31083 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/TarBasedPathInfoProvider.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/TarBasedPathInfoProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2015 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/TarPackageManager.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/TarPackageManager.java
index f8b38bddba8..5089642d59e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/TarPackageManager.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/TarPackageManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ZipArchiver.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ZipArchiver.java
index f94e99ced3f..f4b0be4b87c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ZipArchiver.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ZipArchiver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ZipPackageManager.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ZipPackageManager.java
index 942c95495bf..0599a9c2e21 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ZipPackageManager.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ZipPackageManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.BufferedInputStream;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/AbstractDataSetFileOperationsManager.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/AbstractDataSetFileOperationsManager.java
index 1f4d65d59ba..f7704fa49d9 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/AbstractDataSetFileOperationsManager.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/AbstractDataSetFileOperationsManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/ArchiveDestination.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/ArchiveDestination.java
index 33ead6ff418..7e90b626a97 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/ArchiveDestination.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/ArchiveDestination.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
 
 import ch.systemsx.cisd.openbis.dss.generic.server.IDataSetFileOperationsExecutor;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/ArchiveDestinationFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/ArchiveDestinationFactory.java
index 9a84404a7a1..57abda83351 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/ArchiveDestinationFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/ArchiveDestinationFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/CleanUpUnarchivingScratchShareTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/CleanUpUnarchivingScratchShareTask.java
index 5cfecbbc231..721b6fc57ca 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/CleanUpUnarchivingScratchShareTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/CleanUpUnarchivingScratchShareTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 ETH Zuerich, SIS
+ * Copyright ETH 2022 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/FileDeleter.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/FileDeleter.java
index 59912ebee8f..86f236dc152 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/FileDeleter.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/FileDeleter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, SIS
+ * Copyright ETH 2015 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/IMultiDataSetArchiveCleaner.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/IMultiDataSetArchiveCleaner.java
index 84e6e1ae04d..7a3473ec00f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/IMultiDataSetArchiveCleaner.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/IMultiDataSetArchiveCleaner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/IMultiDataSetFileOperationsManager.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/IMultiDataSetFileOperationsManager.java
index 721e1c22e54..a82cd3b0ac2 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/IMultiDataSetFileOperationsManager.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/IMultiDataSetFileOperationsManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/IMultiDataSetPackageManager.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/IMultiDataSetPackageManager.java
index f9e64ad3e11..49efa4f4761 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/IMultiDataSetPackageManager.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/IMultiDataSetPackageManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiveCleaner.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiveCleaner.java
index 3e30dc71ea1..581dfadedd4 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiveCleaner.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiveCleaner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, SIS
+ * Copyright ETH 2015 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiveSanityCheckMaintenanceTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiveSanityCheckMaintenanceTask.java
index cdb3626aaeb..fbfe5317394 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiveSanityCheckMaintenanceTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiveSanityCheckMaintenanceTask.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2022 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiver.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiver.java
index f468a881145..ded3f2c913e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiver.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchivingFinalizer.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchivingFinalizer.java
index bab3f0a94d9..fd947a3dbef 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchivingFinalizer.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchivingFinalizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, SIS
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchivingUtils.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchivingUtils.java
index 64747413d01..50edb48ed38 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchivingUtils.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchivingUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetDeletionMaintenanceTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetDeletionMaintenanceTask.java
index 25bb1273832..a87cccb257c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetDeletionMaintenanceTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetDeletionMaintenanceTask.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2021 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetFileOperationsManager.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetFileOperationsManager.java
index 5f99700510a..12855b88e1e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetFileOperationsManager.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetFileOperationsManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetPackageManager.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetPackageManager.java
index 974cddfa0c4..5ac8901a25c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetPackageManager.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetPackageManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetUnarchivingMaintenanceTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetUnarchivingMaintenanceTask.java
index 7f6dd98d857..130163f53e1 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetUnarchivingMaintenanceTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetUnarchivingMaintenanceTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, SIS
+ * Copyright ETH 2015 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/RetryCaller.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/RetryCaller.java
index b97288d2c4b..fc2394e95c4 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/RetryCaller.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/RetryCaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2022 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
 
 import ch.systemsx.cisd.common.logging.ISimpleLogger;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/IMultiDataSetArchiverDBTransaction.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/IMultiDataSetArchiverDBTransaction.java
index ba13fcea369..c883fdaabaa 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/IMultiDataSetArchiverDBTransaction.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/IMultiDataSetArchiverDBTransaction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, SIS
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.dataaccess;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/IMultiDataSetArchiverQueryDAO.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/IMultiDataSetArchiverQueryDAO.java
index 7ad1e54f5f7..615da3ff0e3 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/IMultiDataSetArchiverQueryDAO.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/IMultiDataSetArchiverQueryDAO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.dataaccess;
 
 import net.lemnik.eodsql.Select;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/IMultiDataSetArchiverReadonlyQueryDAO.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/IMultiDataSetArchiverReadonlyQueryDAO.java
index 35d82222ec5..cabdb3e42f1 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/IMultiDataSetArchiverReadonlyQueryDAO.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/IMultiDataSetArchiverReadonlyQueryDAO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.dataaccess;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDataSetArchiverContainerDTO.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDataSetArchiverContainerDTO.java
index 530eda66c46..72f282a9923 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDataSetArchiverContainerDTO.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDataSetArchiverContainerDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.dataaccess;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDataSetArchiverDBTransaction.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDataSetArchiverDBTransaction.java
index f65b06ad3f5..4b5d0176b58 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDataSetArchiverDBTransaction.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDataSetArchiverDBTransaction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.dataaccess;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDataSetArchiverDBVersionHolder.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDataSetArchiverDBVersionHolder.java
index 06fd7d004c7..dbfb2c665ad 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDataSetArchiverDBVersionHolder.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDataSetArchiverDBVersionHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.dataaccess;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.IDatabaseVersionHolder;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDataSetArchiverDataSetDTO.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDataSetArchiverDataSetDTO.java
index e77121c331e..c8b4f67aafc 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDataSetArchiverDataSetDTO.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDataSetArchiverDataSetDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.dataaccess;
 
 import net.lemnik.eodsql.ResultColumn;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDataSetArchiverDataSourceUtil.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDataSetArchiverDataSourceUtil.java
index f2c968a3396..d36dcfe2d8b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDataSetArchiverDataSourceUtil.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDataSetArchiverDataSourceUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.dataaccess;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/ArchiverPluginFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/ArchiverPluginFactory.java
index 2a7eb998914..39efaab2ea7 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/ArchiverPluginFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/ArchiverPluginFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/IPluginTaskInfoProvider.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/IPluginTaskInfoProvider.java
index b7de9e8a657..e90bf56c3ce 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/IPluginTaskInfoProvider.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/IPluginTaskInfoProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/IReportingPluginTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/IReportingPluginTask.java
index 94398d8076c..0005ba3c1af 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/IReportingPluginTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/IReportingPluginTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/IterativeTableModelBuilder.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/IterativeTableModelBuilder.java
index f4fae48300c..9bc7e8d58f0 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/IterativeTableModelBuilder.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/IterativeTableModelBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/PluginTaskFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/PluginTaskFactory.java
index 3adcb1c4db0..21a43f19ed5 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/PluginTaskFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/PluginTaskFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks;
 
 import java.io.ByteArrayInputStream;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/PluginTaskInfoProvider.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/PluginTaskInfoProvider.java
index 1208db309c8..daf5bac9685 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/PluginTaskInfoProvider.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/PluginTaskInfoProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/PluginTaskProvider.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/PluginTaskProvider.java
index 0b79490ca38..6293364422e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/PluginTaskProvider.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/PluginTaskProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/AbstractShareFinder.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/AbstractShareFinder.java
index e8042bda273..358a8374a90 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/AbstractShareFinder.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/AbstractShareFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ArchiveFolders.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ArchiveFolders.java
index 21c64a5055d..20c6213daf2 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ArchiveFolders.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ArchiveFolders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ArchiverTaskContext.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ArchiverTaskContext.java
index 531347247ac..ce16507937c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ArchiverTaskContext.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ArchiverTaskContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/Constants.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/Constants.java
index 36e59a5c16e..d062dd9fe54 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/Constants.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/Constants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSetAwareHierarchicalContent.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSetAwareHierarchicalContent.java
index 7f6067e8157..bce8e087e08 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSetAwareHierarchicalContent.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSetAwareHierarchicalContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSetAwareHierarchicalContentNode.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSetAwareHierarchicalContentNode.java
index cbf0a7ea245..a3277240f02 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSetAwareHierarchicalContentNode.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSetAwareHierarchicalContentNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSetDirectoryProvider.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSetDirectoryProvider.java
index be63d174451..cb9a09e957c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSetDirectoryProvider.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSetDirectoryProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSetProcessingContext.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSetProcessingContext.java
index ad1d1e32c0e..c92c043405f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSetProcessingContext.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSetProcessingContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSetTypeBasedShareFinder.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSetTypeBasedShareFinder.java
index 48de3abd413..139fe818907 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSetTypeBasedShareFinder.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSetTypeBasedShareFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSourceProvider.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSourceProvider.java
index f443b45e20a..3505b97bbc3 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSourceProvider.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSourceProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSourceQueryService.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSourceQueryService.java
index 44cf406b548..8810437f5f9 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSourceQueryService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSourceQueryService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.Map;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataStoreServerV3Factory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataStoreServerV3Factory.java
index a3bbec62983..d9fb4112f63 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataStoreServerV3Factory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataStoreServerV3Factory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import ch.ethz.sis.openbis.generic.dssapi.v3.IDataStoreServerApi;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DefaultDataSourceFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DefaultDataSourceFactory.java
index 7d2437ed947..235adef8535 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DefaultDataSourceFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/DefaultDataSourceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.Properties;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ExperimentBasedShareFinder.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ExperimentBasedShareFinder.java
index 3872bd52411..d5bf6d2aa22 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ExperimentBasedShareFinder.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ExperimentBasedShareFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/HierarchicalContentChecksumProvider.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/HierarchicalContentChecksumProvider.java
index 0467a2cfb0e..cf9fdf3c8cc 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/HierarchicalContentChecksumProvider.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/HierarchicalContentChecksumProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.io.IOException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/HierarchicalContentProvider.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/HierarchicalContentProvider.java
index 0863b512cff..57002945ae4 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/HierarchicalContentProvider.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/HierarchicalContentProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/HierarchicalContentTraverseUtil.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/HierarchicalContentTraverseUtil.java
index 417637447c0..5373c4ec7c0 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/HierarchicalContentTraverseUtil.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/HierarchicalContentTraverseUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IArchiverPlugin.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IArchiverPlugin.java
index 1aa8b16f1bf..df3f2fa01b8 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IArchiverPlugin.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IArchiverPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.io.Serializable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IChecksumProvider.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IChecksumProvider.java
index c26b460a590..e38fc2c1a89 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IChecksumProvider.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IChecksumProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.io.IOException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IConfigProvider.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IConfigProvider.java
index 7fa6e4b30cc..71dd1cbc16f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IConfigProvider.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IConfigProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataSetDeleter.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataSetDeleter.java
index aae8bc95362..a96fbc97cea 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataSetDeleter.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataSetDeleter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataSetDirectoryProvider.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataSetDirectoryProvider.java
index 41fcfe3c50a..56a374d79e7 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataSetDirectoryProvider.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataSetDirectoryProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataSetPathInfoProvider.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataSetPathInfoProvider.java
index ace742302b1..12da5ab44b5 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataSetPathInfoProvider.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataSetPathInfoProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataSetStatusUpdater.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataSetStatusUpdater.java
index aa3a7747a5b..801ea12d545 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataSetStatusUpdater.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataSetStatusUpdater.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataSourceProvider.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataSourceProvider.java
index 2d560234ee8..39412be781f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataSourceProvider.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataSourceProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataStoreServiceInternal.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataStoreServiceInternal.java
index e222f660479..a9502b91642 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataStoreServiceInternal.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDataStoreServiceInternal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDatabaseVersionHolder.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDatabaseVersionHolder.java
index 5f65724bc6f..7c6fe55c7c4 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDatabaseVersionHolder.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IDatabaseVersionHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedBasicOpenBISService.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedBasicOpenBISService.java
index 91a551ab84d..22eb8300e98 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedBasicOpenBISService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedBasicOpenBISService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.Collection;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedOpenBISService.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedOpenBISService.java
index c99c1269062..57db6ca9557 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedOpenBISService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedOpenBISService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.io.InputStream;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IHierarchicalContentNodeVisitor.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IHierarchicalContentNodeVisitor.java
index e9e6e404ca7..15e8b62fbed 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IHierarchicalContentNodeVisitor.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IHierarchicalContentNodeVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContentNode;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IHierarchicalContentProvider.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IHierarchicalContentProvider.java
index 2ee9bfaae4d..700f60337dd 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IHierarchicalContentProvider.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IHierarchicalContentProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IPostRegistrationDatasetHandler.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IPostRegistrationDatasetHandler.java
index 1ae3f977d57..568ff1229d9 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IPostRegistrationDatasetHandler.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IPostRegistrationDatasetHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IProcessingPluginTask.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IProcessingPluginTask.java
index da8b268e75e..dff7929be18 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IProcessingPluginTask.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IProcessingPluginTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.io.Serializable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IPutDataSetService.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IPutDataSetService.java
index 9fcb7e099a6..3b981cc63e2 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IPutDataSetService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IPutDataSetService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IShareFinder.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IShareFinder.java
index dea218b1fc5..e14f8d1e8bf 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IShareFinder.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IShareFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IShareIdManager.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IShareIdManager.java
index c2918b173c5..dd3b854ff42 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IShareIdManager.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IShareIdManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ISingleDataSetPathInfoProvider.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ISingleDataSetPathInfoProvider.java
index 6a504d696f7..bbe00725dc3 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ISingleDataSetPathInfoProvider.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ISingleDataSetPathInfoProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ISpeedChecker.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ISpeedChecker.java
index bf138787250..8bbb4d932f3 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ISpeedChecker.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ISpeedChecker.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.utils.Share;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IUnarchivingPreparation.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IUnarchivingPreparation.java
index e5a87768244..ea6fe6a184e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IUnarchivingPreparation.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IUnarchivingPreparation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IdentifierAttributeMappingManager.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IdentifierAttributeMappingManager.java
index 064ff40fa42..b0df3e9421b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IdentifierAttributeMappingManager.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IdentifierAttributeMappingManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IncomingShareIdProvider.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IncomingShareIdProvider.java
index 47dbf3c81a4..885dcb71c46 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IncomingShareIdProvider.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IncomingShareIdProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.Collection;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ManagedAuthentication.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ManagedAuthentication.java
index 79026e43030..3a109c95d8c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ManagedAuthentication.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ManagedAuthentication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.lang.annotation.ElementType;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/MappingBasedShareFinder.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/MappingBasedShareFinder.java
index fff76619c10..97cd5f897ac 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/MappingBasedShareFinder.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/MappingBasedShareFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.HashMap;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/PathInfoDatabaseVersionHolder.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/PathInfoDatabaseVersionHolder.java
index f1b23b8cf08..2f133f793a3 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/PathInfoDatabaseVersionHolder.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/PathInfoDatabaseVersionHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ProcessingStatus.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ProcessingStatus.java
index 241c5eab7ae..cd859903e2f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ProcessingStatus.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ProcessingStatus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/QueueingDataSetStatusUpdaterService.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/QueueingDataSetStatusUpdaterService.java
index 9bb9c6e923f..a72ea7f2f73 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/QueueingDataSetStatusUpdaterService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/QueueingDataSetStatusUpdaterService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.io.Closeable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ServiceProvider.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ServiceProvider.java
index f6fa2cfe0aa..0796f6ed824 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ServiceProvider.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ServiceProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.Date;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/SimpleDataSourceFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/SimpleDataSourceFactory.java
index 65c2632e9e8..1405a405ac1 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/SimpleDataSourceFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/SimpleDataSourceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.Properties;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/SimpleShareFinder.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/SimpleShareFinder.java
index 1996d5bcd1b..17c668e331c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/SimpleShareFinder.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/SimpleShareFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import static org.apache.commons.io.FileUtils.ONE_KB;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/SpeedChecker.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/SpeedChecker.java
index f94391ef70d..25b96e96492 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/SpeedChecker.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/SpeedChecker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.utils.Share;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/SpeedOptimizedShareFinder.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/SpeedOptimizedShareFinder.java
index 4697c9e01f9..996ba181142 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/SpeedOptimizedShareFinder.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/SpeedOptimizedShareFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/StandardShareFinder.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/StandardShareFinder.java
index b162941b8e0..a697ebfa305 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/StandardShareFinder.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/StandardShareFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/IDataSourceQueryService.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/IDataSourceQueryService.java
index 2fa9c9e0353..558ed6ed8c6 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/IDataSourceQueryService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/IDataSourceQueryService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal;
 
 import java.util.Map;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/ISessionWorkspaceProvider.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/ISessionWorkspaceProvider.java
index cb37afcc489..5df6d915939 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/ISessionWorkspaceProvider.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/ISessionWorkspaceProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/AbstractDataSetAccessPredicate.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/AbstractDataSetAccessPredicate.java
index bdfbc55d618..bfd2f5169e7 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/AbstractDataSetAccessPredicate.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/AbstractDataSetAccessPredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.authorization;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/AuthorizationGuard.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/AuthorizationGuard.java
index 633d1a99d9a..eb5fdde19a9 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/AuthorizationGuard.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/AuthorizationGuard.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.authorization;
 
 import java.lang.annotation.ElementType;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/DataSetAccessGuard.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/DataSetAccessGuard.java
index 0310857c795..c72a9076fb8 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/DataSetAccessGuard.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/DataSetAccessGuard.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.authorization;
 
 import java.lang.annotation.ElementType;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/DataSetCodeStringPredicate.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/DataSetCodeStringPredicate.java
index 8c881fc83c3..0b69019d077 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/DataSetCodeStringPredicate.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/DataSetCodeStringPredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.authorization;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/DataSetFileDTOPredicate.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/DataSetFileDTOPredicate.java
index 7108c22f3ca..f2475abb51b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/DataSetFileDTOPredicate.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/DataSetFileDTOPredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.authorization;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/DssSessionAuthorizationHolder.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/DssSessionAuthorizationHolder.java
index e067e25d322..3c0daf1f9f3 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/DssSessionAuthorizationHolder.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/DssSessionAuthorizationHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.authorization;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/IDssServiceRpcGenericInternal.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/IDssServiceRpcGenericInternal.java
index ba3a4ae1ce0..7e4c0063cec 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/IDssServiceRpcGenericInternal.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/IDssServiceRpcGenericInternal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.authorization;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/IDssSessionAuthorizer.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/IDssSessionAuthorizer.java
index 6f23610a192..9e6758a82fc 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/IDssSessionAuthorizer.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/IDssSessionAuthorizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.authorization;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/NewDataSetPredicate.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/NewDataSetPredicate.java
index b63c6ffd6e1..ca863603565 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/NewDataSetPredicate.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/NewDataSetPredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.authorization;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/PrivilegeLevel.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/PrivilegeLevel.java
index 4962a8cebd3..045bb3bedd4 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/PrivilegeLevel.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/PrivilegeLevel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.authorization;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IDataSetContentProvider.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IDataSetContentProvider.java
index 4c0fb724742..f71dcd01285 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IDataSetContentProvider.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IDataSetContentProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1;
 
 import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContent;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IDataSetImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IDataSetImmutable.java
index c21c33680e2..3a337932e4a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IDataSetImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IDataSetImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IDataSetPredicate.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IDataSetPredicate.java
index 57b139a66a2..7cfe6a23fee 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IDataSetPredicate.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IDataSetPredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IExperimentImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IExperimentImmutable.java
index 406fb5fce15..dbe1547d339 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IExperimentImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IExperimentImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IExternalDataManagementSystemImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IExternalDataManagementSystemImmutable.java
index 1f0501f62ec..633529364d9 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IExternalDataManagementSystemImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IExternalDataManagementSystemImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IMaterialImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IMaterialImmutable.java
index a6a9bc87a88..a2c4d59c724 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IMaterialImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IMaterialImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IMetaprojectAssignments.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IMetaprojectAssignments.java
index f7d5d52e54e..5bfe90658d8 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IMetaprojectAssignments.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IMetaprojectAssignments.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IMetaprojectContent.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IMetaprojectContent.java
index cdf4eb32839..4724062480e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IMetaprojectContent.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IMetaprojectContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1;
 
 import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.id.IObjectId;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IMetaprojectImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IMetaprojectImmutable.java
index c6cd47b4c6d..6331f5f12f5 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IMetaprojectImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IMetaprojectImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IProjectImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IProjectImmutable.java
index c4f1352f5ae..3f1597587ec 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IProjectImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IProjectImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IPropertyAssignmentImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IPropertyAssignmentImmutable.java
index b1bc1a96f52..5232ee5d47a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IPropertyAssignmentImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IPropertyAssignmentImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/ISampleImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/ISampleImmutable.java
index 3d8006ed01a..fa730a161b5 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/ISampleImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/ISampleImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/ISearchService.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/ISearchService.java
index ffb6288c0c7..e11c4271237 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/ISearchService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/ISearchService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/ISpaceImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/ISpaceImmutable.java
index 8651e7172e5..3abdb5f9351 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/ISpaceImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/ISpaceImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IVocabularyImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IVocabularyImmutable.java
index 01cf80306b9..ee38caae0da 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IVocabularyImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IVocabularyImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IVocabularyTermImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IVocabularyTermImmutable.java
index 7a9daf64ba5..3dd9fbc2c46 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IVocabularyTermImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IVocabularyTermImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/MaterialIdentifierCollection.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/MaterialIdentifierCollection.java
index 96ac36c812b..39edff22497 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/MaterialIdentifierCollection.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/MaterialIdentifierCollection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/authorization/IAuthorizationGuardPredicate.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/authorization/IAuthorizationGuardPredicate.java
index fb66a29541a..ae0ede8dcd1 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/authorization/IAuthorizationGuardPredicate.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/authorization/IAuthorizationGuardPredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.authorization;
 
 import ch.systemsx.cisd.common.exceptions.Status;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/authorization/IAuthorizationService.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/authorization/IAuthorizationService.java
index 81610e4bcdd..7d6601d9b42 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/authorization/IAuthorizationService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/authorization/IAuthorizationService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.authorization;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IAttachmentImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IAttachmentImmutable.java
index fb8c0ca4fb5..c7cafc74a67 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IAttachmentImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IAttachmentImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IAuthorizationGroupImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IAuthorizationGroupImmutable.java
index f24ff2d9b43..636f71b1e79 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IAuthorizationGroupImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IAuthorizationGroupImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IDataSetContentProvider.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IDataSetContentProvider.java
index 97a68d2991f..769252dd7fc 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IDataSetContentProvider.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IDataSetContentProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2;
 
 import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContent;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IDataSetImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IDataSetImmutable.java
index 2f9fa60388a..a15599493c4 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IDataSetImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IDataSetImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IDataSetPredicate.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IDataSetPredicate.java
index 3e5f9b33ffd..e8d01dcafcc 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IDataSetPredicate.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IDataSetPredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IExperimentImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IExperimentImmutable.java
index de82ab9057f..2d9dbcab47b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IExperimentImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IExperimentImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2;
 
 import java.util.Date;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IExternalDataManagementSystemImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IExternalDataManagementSystemImmutable.java
index db6e27ae8a4..f6d7eaa21d4 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IExternalDataManagementSystemImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IExternalDataManagementSystemImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalDataManagementSystemType;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IMaterialImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IMaterialImmutable.java
index c7e99903b9a..18f34691762 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IMaterialImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IMaterialImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IMetaprojectAssignments.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IMetaprojectAssignments.java
index 3a07957bd9b..2a84dcc2258 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IMetaprojectAssignments.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IMetaprojectAssignments.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IMetaprojectContent.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IMetaprojectContent.java
index a06d249ad30..ced281a320c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IMetaprojectContent.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IMetaprojectContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2;
 
 import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.id.IObjectId;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IMetaprojectImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IMetaprojectImmutable.java
index 41239de2f33..40eb558a28f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IMetaprojectImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IMetaprojectImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IProjectImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IProjectImmutable.java
index 68ceab8877a..110d98b690f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IProjectImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IProjectImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IPropertyAssignmentImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IPropertyAssignmentImmutable.java
index 78d38d1dcf3..343067c94ee 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IPropertyAssignmentImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IPropertyAssignmentImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IRoleAssignmentImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IRoleAssignmentImmutable.java
index 29be2813a60..cfb9edba9d4 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IRoleAssignmentImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IRoleAssignmentImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/ISampleImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/ISampleImmutable.java
index 6e2ab317bcf..8589077392e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/ISampleImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/ISampleImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/ISearchDomainService.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/ISearchDomainService.java
index 802297dce89..1895c004f24 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/ISearchDomainService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/ISearchDomainService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/ISearchService.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/ISearchService.java
index ba989a8efb9..87bbc1bc461 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/ISearchService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/ISearchService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2;
 
 import java.util.Collection;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/ISpaceImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/ISpaceImmutable.java
index 5aa973695b6..153b55a8844 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/ISpaceImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/ISpaceImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IUserImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IUserImmutable.java
index 23edada5e8e..d320c9d2735 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IUserImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IUserImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IVocabularyImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IVocabularyImmutable.java
index d51e1be38ca..033bb2ee09e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IVocabularyImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IVocabularyImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IVocabularyTermImmutable.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IVocabularyTermImmutable.java
index 7352cb9e365..91ae0751914 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IVocabularyTermImmutable.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/IVocabularyTermImmutable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2;
 
 /**
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/MaterialIdentifierCollection.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/MaterialIdentifierCollection.java
index 109a0eda330..dd11d9ae21d 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/MaterialIdentifierCollection.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/MaterialIdentifierCollection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/authorization/IAuthorizationGuardPredicate.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/authorization/IAuthorizationGuardPredicate.java
index 19783a228b7..73e45ae363b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/authorization/IAuthorizationGuardPredicate.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/authorization/IAuthorizationGuardPredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2.authorization;
 
 import ch.systemsx.cisd.common.exceptions.Status;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/authorization/IAuthorizationService.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/authorization/IAuthorizationService.java
index 885acc762c6..d8b8e0009f8 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/authorization/IAuthorizationService.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v2/authorization/IAuthorizationService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2.authorization;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/DataSetFileDTO.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/DataSetFileDTO.java
index e43dc9f1281..13e9356aae4 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/DataSetFileDTO.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/DataSetFileDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.v1;
 
 import java.io.Serializable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/DataStoreApiUrlUtilities.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/DataStoreApiUrlUtilities.java
index bd9908e215f..80a90dac34b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/DataStoreApiUrlUtilities.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/DataStoreApiUrlUtilities.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.v1;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.GenericSharedConstants.DATA_STORE_SERVER_WEB_APPLICATION_NAME;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/FileInfoDssBuilder.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/FileInfoDssBuilder.java
index a332ef82b4b..144087821cc 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/FileInfoDssBuilder.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/FileInfoDssBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/FileInfoDssDTO.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/FileInfoDssDTO.java
index dca70c89167..821860d96b7 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/FileInfoDssDTO.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/FileInfoDssDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.v1;
 
 import java.io.Serializable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/HierarchicalFileInfoDssBuilder.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/HierarchicalFileInfoDssBuilder.java
index 5e64ee42693..f475b88b426 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/HierarchicalFileInfoDssBuilder.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/HierarchicalFileInfoDssBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.v1;
 
 import java.io.IOException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/IDssServiceRpcGeneric.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/IDssServiceRpcGeneric.java
index 1a01d007ca2..ba73e2f3da8 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/IDssServiceRpcGeneric.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/IDssServiceRpcGeneric.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/NewDataSetDTO.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/NewDataSetDTO.java
index c2db05fcc3b..50b9a99ab31 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/NewDataSetDTO.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/NewDataSetDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/NewDataSetDTOBuilder.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/NewDataSetDTOBuilder.java
index 3dbf2e2f2ea..8d477d5b9bf 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/NewDataSetDTOBuilder.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/NewDataSetDTOBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/NewDataSetMetadataDTO.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/NewDataSetMetadataDTO.java
index 32ac33acafb..399937e178c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/NewDataSetMetadataDTO.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/NewDataSetMetadataDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.v1;
 
 import java.io.Serializable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/ShareInfo.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/ShareInfo.java
index cd946d1a8aa..5abae205488 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/ShareInfo.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/ShareInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.v1;
 
 import java.io.Serializable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/UploadObserver.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/UploadObserver.java
index 04b5b5cc6a6..25b768353a7 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/UploadObserver.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/UploadObserver.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.v1;
 
 public interface UploadObserver {
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/validation/ValidationError.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/validation/ValidationError.java
index 5d5328890cd..6ee70d57961 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/validation/ValidationError.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/validation/ValidationError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.v1.validation;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/validation/ValidationScriptReader.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/validation/ValidationScriptReader.java
index d61d427f3b8..e2dc7c660c0 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/validation/ValidationScriptReader.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/validation/ValidationScriptReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.v1.validation;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/validation/ValidationScriptRunner.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/validation/ValidationScriptRunner.java
index 063858046c6..f4b2f7bb3e2 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/validation/ValidationScriptRunner.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/validation/ValidationScriptRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.v1.validation;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/ContentCache.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/ContentCache.java
index 9d1e1c117f8..41fe2666d13 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/ContentCache.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/ContentCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.content;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/DelayedPersistenceManager.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/DelayedPersistenceManager.java
index c8cff3e1f05..a2178e2d1b2 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/DelayedPersistenceManager.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/DelayedPersistenceManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.content;
 
 import java.io.Serializable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/DssServiceRpcGenericFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/DssServiceRpcGenericFactory.java
index fe2bdc18f68..5efcb40468f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/DssServiceRpcGenericFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/DssServiceRpcGenericFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.content;
 
 import java.util.HashMap;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/IContentCache.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/IContentCache.java
index 6156e6a8fa3..f83b0e10e6f 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/IContentCache.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/IContentCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.content;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/IDssServiceRpcGenericFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/IDssServiceRpcGenericFactory.java
index 0e24ec5574c..cc737b09c78 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/IDssServiceRpcGenericFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/IDssServiceRpcGenericFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.content;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.v1.IDssServiceRpcGeneric;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/IPersistenceManager.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/IPersistenceManager.java
index c1641ffb075..293b34f99c0 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/IPersistenceManager.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/IPersistenceManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.content;
 
 import java.io.Serializable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/PathInfoDBAwareHierarchicalContentFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/PathInfoDBAwareHierarchicalContentFactory.java
index 0f03e58d3d8..30efc074475 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/PathInfoDBAwareHierarchicalContentFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/PathInfoDBAwareHierarchicalContentFactory.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.openbis.dss.generic.shared.content;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/PathInfoDBOnlyHierarchicalContentFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/PathInfoDBOnlyHierarchicalContentFactory.java
index 32e00636863..40da26b2806 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/PathInfoDBOnlyHierarchicalContentFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/PathInfoDBOnlyHierarchicalContentFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.content;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/PathInfoProviderBasedHierarchicalContent.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/PathInfoProviderBasedHierarchicalContent.java
index 54fa2d55e7e..7bca384a880 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/PathInfoProviderBasedHierarchicalContent.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/PathInfoProviderBasedHierarchicalContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.content;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/RemoteHierarchicalContent.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/RemoteHierarchicalContent.java
index 61d56430aa2..e2e0f13c3f7 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/RemoteHierarchicalContent.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/RemoteHierarchicalContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.content;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/RemoteHierarchicalContentNode.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/RemoteHierarchicalContentNode.java
index 476ac644e58..33c9af3df81 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/RemoteHierarchicalContentNode.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/RemoteHierarchicalContentNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.content;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/SimpleFileBasePersistenceManager.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/SimpleFileBasePersistenceManager.java
index 6a1c8272567..dafa5658781 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/SimpleFileBasePersistenceManager.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/SimpleFileBasePersistenceManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.content;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/AtomicEntityOperationDetails.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/AtomicEntityOperationDetails.java
index 6c608098d8f..ad4bd18ce0d 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/AtomicEntityOperationDetails.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/AtomicEntityOperationDetails.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/DataSetCodesWithStatus.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/DataSetCodesWithStatus.java
index c4a388c2272..db72c7c8e78 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/DataSetCodesWithStatus.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/DataSetCodesWithStatus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/DataSetInformation.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/DataSetInformation.java
index f425cc4a768..8f5618d8c59 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/DataSetInformation.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/DataSetInformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/DataSetPathInfo.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/DataSetPathInfo.java
index d7963e662c8..557c46a4ebb 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/DataSetPathInfo.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/DataSetPathInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.dto;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/DataSetRegistrationInformation.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/DataSetRegistrationInformation.java
index 3f0c9e0f3da..92f26bfb765 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/DataSetRegistrationInformation.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/DataSetRegistrationInformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.NewExternalData;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/PathInfo.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/PathInfo.java
index 6cc1ff01ddd..6d1564d71e7 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/PathInfo.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/PathInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.dto;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/PluginServletConfig.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/PluginServletConfig.java
index abebaa28f07..a3dc510b7f1 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/PluginServletConfig.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/PluginServletConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.dto;
 
 import java.util.HashMap;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/Size.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/Size.java
index 271abcd17d5..baa2d1209d7 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/Size.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/Size.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.dto;
 
 public final class Size
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/AbstractDatasetDropboxHandler.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/AbstractDatasetDropboxHandler.java
index 02a8bd27370..74676b7bd5a 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/AbstractDatasetDropboxHandler.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/AbstractDatasetDropboxHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/AutoSymlink.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/AutoSymlink.java
index c2d9f95b819..df56f894c75 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/AutoSymlink.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/AutoSymlink.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/BlastUtils.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/BlastUtils.java
index b49d2ccdb88..42647f40545 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/BlastUtils.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/BlastUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, SIS
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CodeAndLabelUtil.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CodeAndLabelUtil.java
index f2d51f60e80..5548e3223ea 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CodeAndLabelUtil.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CodeAndLabelUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.CodeNormalizer;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CsvFileReaderHelper.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CsvFileReaderHelper.java
index ee44ebe9ef3..5c26519d4c2 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CsvFileReaderHelper.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CsvFileReaderHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DataSetAndPathInfoDBConsistencyChecker.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DataSetAndPathInfoDBConsistencyChecker.java
index b6c7257f0e8..5f2f9ca2c37 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DataSetAndPathInfoDBConsistencyChecker.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DataSetAndPathInfoDBConsistencyChecker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DataSetExistenceChecker.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DataSetExistenceChecker.java
index 670515ccb36..60416f44136 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DataSetExistenceChecker.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DataSetExistenceChecker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DatasetFileLines.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DatasetFileLines.java
index f9a4a980853..2e597eb98ee 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DatasetFileLines.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DatasetFileLines.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DatasetLocationUtil.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DatasetLocationUtil.java
index 7fe01fb8d51..21a152f9e86 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DatasetLocationUtil.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DatasetLocationUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DssCrossOriginFilter.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DssCrossOriginFilter.java
index 73d746eeb46..039165708ba 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DssCrossOriginFilter.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DssCrossOriginFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DssPluginType.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DssPluginType.java
index 689c5c04ca2..980df9a3808 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DssPluginType.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DssPluginType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.util.Properties;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DssPropertyParametersUtil.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DssPropertyParametersUtil.java
index ae8217ab7fb..b7fdb8373eb 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DssPropertyParametersUtil.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DssPropertyParametersUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ExcelFileReader.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ExcelFileReader.java
index f1e46f6b265..bd897cdc2bb 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ExcelFileReader.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ExcelFileReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ITabularData.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ITabularData.java
index ac4ba9befb0..9ac6a1b1190 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ITabularData.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ITabularData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ImageUtil.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ImageUtil.java
index 4190e0c2cc8..535eb61a7ce 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ImageUtil.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ImageUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.awt.Dimension;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ImageUtilReaderPool.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ImageUtilReaderPool.java
index 64db3e03d85..75a6de6e40e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ImageUtilReaderPool.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ImageUtilReaderPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2015 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/Jython27ClassLoader.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/Jython27ClassLoader.java
index 9a82b41ae27..6ae7a44ae9b 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/Jython27ClassLoader.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/Jython27ClassLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, SIS
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/Jython27FactoriesProvider.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/Jython27FactoriesProvider.java
index aa2b6f0a825..8a3f03c5ca7 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/Jython27FactoriesProvider.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/Jython27FactoriesProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, SIS
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/MetaDataBuilder.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/MetaDataBuilder.java
index 129c143af90..4dc4b1b8c97 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/MetaDataBuilder.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/MetaDataBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.text.DateFormat;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/PathInfoDataSourceProvider.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/PathInfoDataSourceProvider.java
index 8cf7327a085..a316a376436 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/PathInfoDataSourceProvider.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/PathInfoDataSourceProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import javax.sql.DataSource;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/PngWritingHelper.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/PngWritingHelper.java
index 8f8bf5a4c69..51ec9da9dcc 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/PngWritingHelper.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/PngWritingHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.awt.image.BufferedImage;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/PostgresPlusFileSystemFreeSpaceProvider.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/PostgresPlusFileSystemFreeSpaceProvider.java
index c55b5e1ddca..f7388ec7869 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/PostgresPlusFileSystemFreeSpaceProvider.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/PostgresPlusFileSystemFreeSpaceProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.io.IOException;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/RSyncConfig.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/RSyncConfig.java
index 1ba7581a1cf..2d90d44b48e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/RSyncConfig.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/RSyncConfig.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.util.List;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtils.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtils.java
index f055a064b3b..62dd75382e8 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtils.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SessionWorkspaceUtil.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SessionWorkspaceUtil.java
index daa1ab8ba51..c6bf21d4603 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SessionWorkspaceUtil.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SessionWorkspaceUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/Share.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/Share.java
index ce1526a1a36..229171d89bb 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/Share.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/Share.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ShareFactory.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ShareFactory.java
index 634c987b582..b2746a44124 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ShareFactory.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ShareFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SharesHolder.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SharesHolder.java
index 1ae116d679a..19b03f0049e 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SharesHolder.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SharesHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.io.File;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SpeedUtils.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SpeedUtils.java
index 3a217e7f8ba..3b8f83aea2c 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SpeedUtils.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SpeedUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import ch.systemsx.cisd.openbis.generic.shared.Constants;
diff --git a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ToStringUtil.java b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ToStringUtil.java
index c133976ae2d..a31e6398d65 100644
--- a/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ToStringUtil.java
+++ b/server-original-data-store/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ToStringUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 /**
diff --git a/server-original-data-store/source/java/org/python/core/SyspathArchiveHack.java b/server-original-data-store/source/java/org/python/core/SyspathArchiveHack.java
index 9e39d1578b2..49648fc3819 100644
--- a/server-original-data-store/source/java/org/python/core/SyspathArchiveHack.java
+++ b/server-original-data-store/source/java/org/python/core/SyspathArchiveHack.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.python.core;
 
 import java.io.IOException;
diff --git a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataSetFileCreationBuilder.java b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataSetFileCreationBuilder.java
index 3fa2f10f303..c1c4df2a0b3 100644
--- a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataSetFileCreationBuilder.java
+++ b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/api/v3/DataSetFileCreationBuilder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.ethz.sis.openbis.generic.dss.api.v3;
 
 import java.util.Random;
diff --git a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/api/v3/PathInfoFeederTest.java b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/api/v3/PathInfoFeederTest.java
index effe3959251..338624ff4c7 100644
--- a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/api/v3/PathInfoFeederTest.java
+++ b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/api/v3/PathInfoFeederTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.ethz.sis.openbis.generic.dss.api.v3;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/AbstractArchiveUnarchiveDataSetTest.java b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/AbstractArchiveUnarchiveDataSetTest.java
index 04990094db5..f2019074f33 100644
--- a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/AbstractArchiveUnarchiveDataSetTest.java
+++ b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/AbstractArchiveUnarchiveDataSetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, CISD
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.dss.systemtest.api.v3;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/AbstractFileTest.java b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/AbstractFileTest.java
index 0b2edd497ff..9ca5c33b1b0 100644
--- a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/AbstractFileTest.java
+++ b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/AbstractFileTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2015 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.ethz.sis.openbis.generic.dss.systemtest.api.v3;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/AggregationServiceTest.java b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/AggregationServiceTest.java
index 3eda17e5e11..0f846e12e91 100644
--- a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/AggregationServiceTest.java
+++ b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/AggregationServiceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.dss.systemtest.api.v3;
 
 import java.text.SimpleDateFormat;
diff --git a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/ArchiveDataSetTest.java b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/ArchiveDataSetTest.java
index f2623f838a5..9a3c5d32423 100644
--- a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/ArchiveDataSetTest.java
+++ b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/ArchiveDataSetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, CISD
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.dss.systemtest.api.v3;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/CreateExperimentsImportTest.java b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/CreateExperimentsImportTest.java
index f25c0a1b17b..847ece177d4 100644
--- a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/CreateExperimentsImportTest.java
+++ b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/CreateExperimentsImportTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.dss.systemtest.api.v3;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/CreateMaterialsImportTest.java b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/CreateMaterialsImportTest.java
index 23277cb75fc..e9a221c5f54 100644
--- a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/CreateMaterialsImportTest.java
+++ b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/CreateMaterialsImportTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.dss.systemtest.api.v3;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/CreateSamplesImportTest.java b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/CreateSamplesImportTest.java
index 1ba99d050b7..756b77324c5 100644
--- a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/CreateSamplesImportTest.java
+++ b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/CreateSamplesImportTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.dss.systemtest.api.v3;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/CreateUploadedDataSetsTest.java b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/CreateUploadedDataSetsTest.java
index 64111124bd8..4ceadfd8165 100644
--- a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/CreateUploadedDataSetsTest.java
+++ b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/CreateUploadedDataSetsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.dss.systemtest.api.v3;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/CustomImportTest.java b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/CustomImportTest.java
index dae1cb05fa1..da067e7469f 100644
--- a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/CustomImportTest.java
+++ b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/CustomImportTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.dss.systemtest.api.v3;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/DownloadFileTest.java b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/DownloadFileTest.java
index 7a7fbc5dee2..7561607cf82 100644
--- a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/DownloadFileTest.java
+++ b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/DownloadFileTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2015 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.ethz.sis.openbis.generic.dss.systemtest.api.v3;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/GeneralImportTest.java b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/GeneralImportTest.java
index 66df79a0431..1df1c0a38da 100644
--- a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/GeneralImportTest.java
+++ b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/GeneralImportTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.dss.systemtest.api.v3;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/LockDataSetTest.java b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/LockDataSetTest.java
index 29eaca56057..47339ecba0a 100644
--- a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/LockDataSetTest.java
+++ b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/LockDataSetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.dss.systemtest.api.v3;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/ObjectsImportTest.java b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/ObjectsImportTest.java
index 5f293ebdd6c..e7b94abfd9e 100644
--- a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/ObjectsImportTest.java
+++ b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/ObjectsImportTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.dss.systemtest.api.v3;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/ProcessingServiceTest.java b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/ProcessingServiceTest.java
index bc16fd21b80..a1fc1fb5f99 100644
--- a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/ProcessingServiceTest.java
+++ b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/ProcessingServiceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.dss.systemtest.api.v3;
 
 import static ch.systemsx.cisd.common.test.AssertionUtil.assertContains;
diff --git a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/ReportingServiceTest.java b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/ReportingServiceTest.java
index e68cea4b11f..5393b71cdb1 100644
--- a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/ReportingServiceTest.java
+++ b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/ReportingServiceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.dss.systemtest.api.v3;
 
 import java.text.ParseException;
diff --git a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/SearchDomainServiceTest.java b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/SearchDomainServiceTest.java
index 4bae3b502ca..491b667ec97 100644
--- a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/SearchDomainServiceTest.java
+++ b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/SearchDomainServiceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.dss.systemtest.api.v3;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/SearchFileTest.java b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/SearchFileTest.java
index ca346b3fec7..c18616ef9fe 100644
--- a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/SearchFileTest.java
+++ b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/SearchFileTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2015 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.ethz.sis.openbis.generic.dss.systemtest.api.v3;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UnarchiveDataSetTest.java b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UnarchiveDataSetTest.java
index 3a4de65d493..9602fe64df9 100644
--- a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UnarchiveDataSetTest.java
+++ b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UnarchiveDataSetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, CISD
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.dss.systemtest.api.v3;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UnlockDataSetTest.java b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UnlockDataSetTest.java
index 42ae47be823..ddc7c4d3d3c 100644
--- a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UnlockDataSetTest.java
+++ b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UnlockDataSetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2016 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.dss.systemtest.api.v3;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UpdateDataSetsImportTest.java b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UpdateDataSetsImportTest.java
index cc96d0c108c..2c32f8b670d 100644
--- a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UpdateDataSetsImportTest.java
+++ b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UpdateDataSetsImportTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.dss.systemtest.api.v3;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UpdateExperimentsImportTest.java b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UpdateExperimentsImportTest.java
index e4c368e4adb..ea31e8a6da2 100644
--- a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UpdateExperimentsImportTest.java
+++ b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UpdateExperimentsImportTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.dss.systemtest.api.v3;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UpdateMaterialsImportTest.java b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UpdateMaterialsImportTest.java
index b205e7e29e4..e6a4ce31c4b 100644
--- a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UpdateMaterialsImportTest.java
+++ b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UpdateMaterialsImportTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.dss.systemtest.api.v3;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UpdateSamplesImportTest.java b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UpdateSamplesImportTest.java
index 57ff68b4d32..75a7f424769 100644
--- a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UpdateSamplesImportTest.java
+++ b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UpdateSamplesImportTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.dss.systemtest.api.v3;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UploadServletTest.java b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UploadServletTest.java
index 0c090af2f63..55df0b470f2 100644
--- a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UploadServletTest.java
+++ b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/dss/systemtest/api/v3/UploadServletTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.dss.systemtest.api.v3;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/server/dss/plugins/DataSetRegistrationCleanUpTaskTest.java b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/server/dss/plugins/DataSetRegistrationCleanUpTaskTest.java
index b37b5329a7b..ad914de614f 100644
--- a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/server/dss/plugins/DataSetRegistrationCleanUpTaskTest.java
+++ b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/server/dss/plugins/DataSetRegistrationCleanUpTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 ETH Zuerich, SIS
+ * Copyright ETH 2020 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/EntityRetrieverTest.java b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/EntityRetrieverTest.java
index 605504719f3..5f30c530a4a 100644
--- a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/EntityRetrieverTest.java
+++ b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/EntityRetrieverTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.common;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/DataSourceUtilsTest.java b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/DataSourceUtilsTest.java
index 041b15bb806..1d5b7b8127a 100644
--- a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/DataSourceUtilsTest.java
+++ b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/datasource/DataSourceUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.datasource;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/MasterDataSynchronizerTest.java b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/MasterDataSynchronizerTest.java
index b94c62d7e92..93cc169b1fe 100644
--- a/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/MasterDataSynchronizerTest.java
+++ b/server-original-data-store/sourceTest/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/harvester/synchronizer/MasterDataSynchronizerTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2020 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.ethz.sis.openbis.generic.server.dss.plugins.sync.harvester.synchronizer;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/AbstractStorageProcessorWithDropboxTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/AbstractStorageProcessorWithDropboxTest.java
index 11834bc07a3..34938403695 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/AbstractStorageProcessorWithDropboxTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/AbstractStorageProcessorWithDropboxTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/ChannelSetHelperTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/ChannelSetHelperTest.java
index ce583e2ae41..86f8bc7a49a 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/ChannelSetHelperTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/ChannelSetHelperTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/CifexStorageProcessorTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/CifexStorageProcessorTest.java
index ce3ceb74ec9..35c14ac69be 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/CifexStorageProcessorTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/CifexStorageProcessorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/CodeExtractortTestCase.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/CodeExtractortTestCase.java
index de2ac726668..c4ad68912ea 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/CodeExtractortTestCase.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/CodeExtractortTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 /**
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/DataSetNameEntitiesProviderTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/DataSetNameEntitiesProviderTest.java
index c747491fa75..4ee8e2d660e 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/DataSetNameEntitiesProviderTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/DataSetNameEntitiesProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithmTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithmTest.java
index ad60f5d07ec..b06d0c2d18e 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithmTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithmTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/DataStrategyStoreTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/DataStrategyStoreTest.java
index 32adb58c01c..1a117189fb5 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/DataStrategyStoreTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/DataStrategyStoreTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/DefaultDataSetInfoExtractorTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/DefaultDataSetInfoExtractorTest.java
index 59e4317c8d8..1e2faff8dd2 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/DefaultDataSetInfoExtractorTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/DefaultDataSetInfoExtractorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import static ch.systemsx.cisd.etlserver.AbstractDataSetInfoExtractor.GROUP_CODE;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/DefaultStorageProcessorTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/DefaultStorageProcessorTest.java
index 0f42ec1515f..d2ee598004a 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/DefaultStorageProcessorTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/DefaultStorageProcessorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/DispatcherStorageProcessorTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/DispatcherStorageProcessorTest.java
index 7a61147c68f..addad11c5be 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/DispatcherStorageProcessorTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/DispatcherStorageProcessorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/DssRegistrationLogDirectoryHelperTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/DssRegistrationLogDirectoryHelperTest.java
index b973a9f8756..ba5a2d5b018 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/DssRegistrationLogDirectoryHelperTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/DssRegistrationLogDirectoryHelperTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.IOException;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/FileBasedFileTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/FileBasedFileTest.java
index b92e8388c0f..c047c034c48 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/FileBasedFileTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/FileBasedFileTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/FileTypeExtractorTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/FileTypeExtractorTest.java
index 3fe2d709683..6e6268c6aa4 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/FileTypeExtractorTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/FileTypeExtractorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/HCSImageCheckListTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/HCSImageCheckListTest.java
index 7a25d2076e5..3c6e6c3f7c1 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/HCSImageCheckListTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/HCSImageCheckListTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/IdentifiedDataStrategyTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/IdentifiedDataStrategyTest.java
index 6281f3f83f7..620b431b81f 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/IdentifiedDataStrategyTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/IdentifiedDataStrategyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/MainTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/MainTest.java
index c9940738eb8..1ae7dc1bcf6 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/MainTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/MainTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/NamedDataStrategyTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/NamedDataStrategyTest.java
index fe8379f9f8e..762c504f8be 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/NamedDataStrategyTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/NamedDataStrategyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/SimpleTypeExtractorTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/SimpleTypeExtractorTest.java
index 813726fb4ed..61318ba2a92 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/SimpleTypeExtractorTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/SimpleTypeExtractorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/StandardProcessorTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/StandardProcessorTest.java
index cac03809cb6..e560b398e8c 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/StandardProcessorTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/StandardProcessorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/ThreadParametersTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/ThreadParametersTest.java
index f36cd5c7625..36d714fcab5 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/ThreadParametersTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/ThreadParametersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandlerTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandlerTest.java
index b4fcaf9c5d1..1a801e74d16 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandlerTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetTopLevelDataSetHandlerTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetTopLevelDataSetHandlerTest.java
index e91dbbc832a..de867d90912 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetTopLevelDataSetHandlerTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetTopLevelDataSetHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.api.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/api/v1/TestDataSetTypeToTopLevelRegistratorMapper.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/api/v1/TestDataSetTypeToTopLevelRegistratorMapper.java
index 4a490fbd630..555c380d87c 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/api/v1/TestDataSetTypeToTopLevelRegistratorMapper.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/api/v1/TestDataSetTypeToTopLevelRegistratorMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.api.v1;
 
 import ch.systemsx.cisd.etlserver.ITopLevelDataSetRegistrator;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/SampleAndDatasetRegistrationHandlerTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/SampleAndDatasetRegistrationHandlerTest.java
index 59e9fb06424..a0a3cd241de 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/SampleAndDatasetRegistrationHandlerTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/SampleAndDatasetRegistrationHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.entityregistration;
 
 import static ch.systemsx.cisd.etlserver.entityregistration.SampleAndDataSetRegistrationHandler.DATA_SET_TYPE_PROPERTIES_KEY;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/SampleDataSetPairParserObjectFactoryTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/SampleDataSetPairParserObjectFactoryTest.java
index f3b2cec0509..7fac71a17e1 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/SampleDataSetPairParserObjectFactoryTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/SampleDataSetPairParserObjectFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.entityregistration;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/AbstractHDF5StorageProcessorTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/AbstractHDF5StorageProcessorTest.java
index 673e081a1cd..fc25b6223f6 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/AbstractHDF5StorageProcessorTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/AbstractHDF5StorageProcessorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.hdf5;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/HDF5StorageProcessorNoCompressionTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/HDF5StorageProcessorNoCompressionTest.java
index 302b3b38277..92202eba3c3 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/HDF5StorageProcessorNoCompressionTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/HDF5StorageProcessorNoCompressionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.hdf5;
 
 import java.util.Properties;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/HDF5StorageProcessorWithCompressionTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/HDF5StorageProcessorWithCompressionTest.java
index 5d3d1a092c0..42548510aed 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/HDF5StorageProcessorWithCompressionTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/HDF5StorageProcessorWithCompressionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.hdf5;
 
 import java.util.Properties;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5ConcurrencyTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5ConcurrencyTest.java
index 801bf564482..50e1b5806a5 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5ConcurrencyTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5ConcurrencyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.hdf5;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/DataSetAndPathInfoDBConsistencyCheckTaskTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/DataSetAndPathInfoDBConsistencyCheckTaskTest.java
index 51decceeef2..bc34f769621 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/DataSetAndPathInfoDBConsistencyCheckTaskTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/DataSetAndPathInfoDBConsistencyCheckTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.path;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/DatabaseBasedDataSetPathsInfoFeederTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/DatabaseBasedDataSetPathsInfoFeederTest.java
index 2c385740778..2670ca3efe2 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/DatabaseBasedDataSetPathsInfoFeederTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/DatabaseBasedDataSetPathsInfoFeederTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.path;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/IPathsInfoDAOTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/IPathsInfoDAOTest.java
index 82bdabc2352..c6dbe57635d 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/IPathsInfoDAOTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/IPathsInfoDAOTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.path;
 
 import java.util.Date;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/MockPathsInfoDAO.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/MockPathsInfoDAO.java
index 3e4087633ee..7cd131b07a3 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/MockPathsInfoDAO.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/MockPathsInfoDAO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.path;
 
 import java.io.PrintWriter;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseChecksumCalculationTaskTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseChecksumCalculationTaskTest.java
index 0e221cbc633..122a103709f 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseChecksumCalculationTaskTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseChecksumCalculationTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.path;
 
 import java.io.ByteArrayInputStream;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseFeedingTaskTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseFeedingTaskTest.java
index c14f8584e8f..da834423ee0 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseFeedingTaskTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseFeedingTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.path;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseRefreshingTaskTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseRefreshingTaskTest.java
index 9d5f3eaeb02..d1ddb8e533e 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseRefreshingTaskTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseRefreshingTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.path;
 
 import static ch.systemsx.cisd.etlserver.path.PathInfoDatabaseRefreshingTask.CHUNK_SIZE_KEY;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/TimeIntervalTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/TimeIntervalTest.java
index fec4130e4e0..e2730c95d57 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/TimeIntervalTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/path/TimeIntervalTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.path;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/AbstractAutoArchiverPolicyTestCase.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/AbstractAutoArchiverPolicyTestCase.java
index 0ec110cea81..ab4933cc783 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/AbstractAutoArchiverPolicyTestCase.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/AbstractAutoArchiverPolicyTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, SIS
+ * Copyright ETH 2015 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/AutoArchiverTaskTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/AutoArchiverTaskTest.java
index 0c780d3710c..f328e1fc468 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/AutoArchiverTaskTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/AutoArchiverTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, SIS
+ * Copyright ETH 2015 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/BlastDatabaseCreationMaintenanceTaskTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/BlastDatabaseCreationMaintenanceTaskTest.java
index 133f48efa2c..d1bbe20eba0 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/BlastDatabaseCreationMaintenanceTaskTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/BlastDatabaseCreationMaintenanceTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, SIS
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import static ch.systemsx.cisd.etlserver.plugins.BlastDatabaseCreationMaintenanceTask.BLAST_TEMP_FOLDER_PROPERTY;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/ByExperimentPolicyTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/ByExperimentPolicyTest.java
index 82236c61796..02469cb21e1 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/ByExperimentPolicyTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/ByExperimentPolicyTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/ByPoliceAbstractTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/ByPoliceAbstractTest.java
index e07d94d4426..2d8957d8d42 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/ByPoliceAbstractTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/ByPoliceAbstractTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/BySpacePolicyTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/BySpacePolicyTest.java
index 11d0de3cc40..d9266c7aeee 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/BySpacePolicyTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/BySpacePolicyTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/DeleteDataSetsAlreadyDeletedInApplicationServerMaintenanceTaskTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/DeleteDataSetsAlreadyDeletedInApplicationServerMaintenanceTaskTest.java
index 37abff3d072..6b428e08135 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/DeleteDataSetsAlreadyDeletedInApplicationServerMaintenanceTaskTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/DeleteDataSetsAlreadyDeletedInApplicationServerMaintenanceTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/ExperimentBasedArchivingTaskTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/ExperimentBasedArchivingTaskTest.java
index d448b2255e3..57243f19466 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/ExperimentBasedArchivingTaskTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/ExperimentBasedArchivingTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/FastaFileBuilderForDataSetFilesTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/FastaFileBuilderForDataSetFilesTest.java
index 3daaed7ae77..72a0606f9ed 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/FastaFileBuilderForDataSetFilesTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/FastaFileBuilderForDataSetFilesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, SIS
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/FileSystemMonitoringMaintenanceTaskTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/FileSystemMonitoringMaintenanceTaskTest.java
index b53cd5f8aeb..6964f4791dc 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/FileSystemMonitoringMaintenanceTaskTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/FileSystemMonitoringMaintenanceTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import static ch.systemsx.cisd.etlserver.plugins.FileSystemMonitoringMaintenanceTask.DEFAULT_IMPORT_STATE_MARKER_FILE_PREFIX;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTaskTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTaskTest.java
index ee2a9a64287..30e35a0c2d8 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTaskTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/FillUnknownDataSetSizeInOpenbisDBFromPathInfoDBMaintenanceTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import static ch.systemsx.cisd.common.test.ArrayContainsExactlyMatcher.containsExactly;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/GroupingPolicyTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/GroupingPolicyTest.java
index 50ebaba79c7..db21c061843 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/GroupingPolicyTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/GroupingPolicyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, SIS
+ * Copyright ETH 2015 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.lang.reflect.Method;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/HierarchicalStorageUpdaterTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/HierarchicalStorageUpdaterTest.java
index 8f68dfa890b..81b1ff0600f 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/HierarchicalStorageUpdaterTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/HierarchicalStorageUpdaterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/LastSeenDataSetFileContentTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/LastSeenDataSetFileContentTest.java
index 16419743452..eb435978917 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/LastSeenDataSetFileContentTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/LastSeenDataSetFileContentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/SegmentedStoreShufflingTaskTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/SegmentedStoreShufflingTaskTest.java
index 3ed2d30c9bf..af5b57681c2 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/SegmentedStoreShufflingTaskTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/SegmentedStoreShufflingTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import static ch.systemsx.cisd.etlserver.plugins.SegmentedStoreShufflingTask.CLASS_PROPERTY_NAME;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/SimpleShufflingShareFinderTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/SimpleShufflingShareFinderTest.java
index 08829c8f57b..c62faabf742 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/SimpleShufflingShareFinderTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/SimpleShufflingShareFinderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import static ch.systemsx.cisd.etlserver.plugins.SimpleShufflingShareFinder.MINIMUM_FREE_SPACE_KEY;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/SimpleShufflingTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/SimpleShufflingTest.java
index 0bc9c5ae431..06b289904a9 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/SimpleShufflingTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/SimpleShufflingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import static org.apache.commons.io.FileUtils.ONE_MB;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/TemplateBasedLinkNamingStrategyTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/TemplateBasedLinkNamingStrategyTest.java
index d57771930a7..e3ff8389fc6 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/TemplateBasedLinkNamingStrategyTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/TemplateBasedLinkNamingStrategyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.plugins;
 
 import static ch.systemsx.cisd.etlserver.plugins.TemplateBasedLinkNamingStrategy.DEFAULT_LINK_TEMPLATE;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/ArchivingPostRegistrationTaskTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/ArchivingPostRegistrationTaskTest.java
index 105611b467a..83da47c8bc1 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/ArchivingPostRegistrationTaskTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/ArchivingPostRegistrationTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.postregistration;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetArchivingStatus.AVAILABLE;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/EagerShufflingTaskTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/EagerShufflingTaskTest.java
index b987483c2e4..f9664073008 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/EagerShufflingTaskTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/EagerShufflingTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.postregistration;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/NotifyingTaskTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/NotifyingTaskTest.java
index bd5fbeee13d..73630964110 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/NotifyingTaskTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/NotifyingTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.postregistration;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/PostRegistrationMaintenanceTaskTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/PostRegistrationMaintenanceTaskTest.java
index 0dd8510040f..3818a23200c 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/PostRegistrationMaintenanceTaskTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/PostRegistrationMaintenanceTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.postregistration;
 
 import static ch.systemsx.cisd.etlserver.postregistration.PostRegistrationMaintenanceTask.LAST_SEEN_DATA_SET_FILE_PROPERTY;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/RequestArchivingPostRegistrationTaskTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/RequestArchivingPostRegistrationTaskTest.java
index 217ce484887..89859080e3a 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/RequestArchivingPostRegistrationTaskTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/RequestArchivingPostRegistrationTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2018 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.postregistration;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/SecondCopyPostRegistrationTaskTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/SecondCopyPostRegistrationTaskTest.java
index d48f0f68471..6b05b6cff92 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/SecondCopyPostRegistrationTaskTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/SecondCopyPostRegistrationTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.postregistration;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/AbstractJythonDataSetHandlerTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/AbstractJythonDataSetHandlerTest.java
index ca950eb06c8..c80094bfd91 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/AbstractJythonDataSetHandlerTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/AbstractJythonDataSetHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/ConfiguredOnErrorActionDecisionTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/ConfiguredOnErrorActionDecisionTest.java
index e9651d3d016..3cfa6e8b2ab 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/ConfiguredOnErrorActionDecisionTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/ConfiguredOnErrorActionDecisionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator;
 
 import java.util.Properties;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/DataSetStorageRollbackerTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/DataSetStorageRollbackerTest.java
index a10662f89f0..960d4703631 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/DataSetStorageRollbackerTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/DataSetStorageRollbackerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/ITestingDataSetHandler.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/ITestingDataSetHandler.java
index f99c06e3bf9..9d8ef724dfa 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/ITestingDataSetHandler.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/ITestingDataSetHandler.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.etlserver.registrator;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaAllHooks.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaAllHooks.java
index 2b447ce3001..541c1a01a5d 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaAllHooks.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaAllHooks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator;
 
 import java.io.IOException;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2DyingProgram.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2DyingProgram.java
index 9240a9d59dc..1eb5b12f869 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2DyingProgram.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2DyingProgram.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator;
 
 import ch.systemsx.cisd.common.exceptions.NotImplementedException;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2FileNotFound.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2FileNotFound.java
index e9e7027ce43..7dec1c8822c 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2FileNotFound.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2FileNotFound.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator;
 
 import ch.systemsx.cisd.common.exceptions.NotImplementedException;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2SimpleTestcase.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2SimpleTestcase.java
index e14307f8b69..0485df59e22 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2SimpleTestcase.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2SimpleTestcase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2TestcasePostregistrationHookFailed.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2TestcasePostregistrationHookFailed.java
index 1ac0878ac92..dfcbd9055d0 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2TestcasePostregistrationHookFailed.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2TestcasePostregistrationHookFailed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator;
 
 import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2TestcasePreregistrationHookFailed.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2TestcasePreregistrationHookFailed.java
index 04c7cdf56f2..79cc0f24a87 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2TestcasePreregistrationHookFailed.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2TestcasePreregistrationHookFailed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator;
 
 import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2TestcaseRegistrationContext.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2TestcaseRegistrationContext.java
index f2d248cbf98..48dd2ab538d 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2TestcaseRegistrationContext.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2TestcaseRegistrationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator;
 
 import java.io.IOException;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2TestcaseRollback.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2TestcaseRollback.java
index 69dbbecdf76..026e77b87bf 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2TestcaseRollback.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2TestcaseRollback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator;
 
 import ch.systemsx.cisd.common.exceptions.NotImplementedException;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2TestcaseWithoutPostStorage.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2TestcaseWithoutPostStorage.java
index c464c3259e5..4cc38901b5e 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2TestcaseWithoutPostStorage.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JavaV2TestcaseWithoutPostStorage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonDropboxRecoveryTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonDropboxRecoveryTest.java
index d7fad8e6ad7..50efda53e1f 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonDropboxRecoveryTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonDropboxRecoveryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonHookTestTool.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonHookTestTool.java
index 269b9058b4b..f027c9e371d 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonHookTestTool.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonHookTestTool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator;
 
 import java.io.BufferedWriter;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorRollbackTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorRollbackTest.java
index b79cab27627..1a7e298f960 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorRollbackTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorRollbackTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java
index 1629f701e93..44137a6d113 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/MarkerFileUtilityTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/MarkerFileUtilityTest.java
index 31c374945c1..06ca19dc518 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/MarkerFileUtilityTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/MarkerFileUtilityTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/TestingDataSetHandler.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/TestingDataSetHandler.java
index 05d8f14a561..1dc52b5a59b 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/TestingDataSetHandler.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/TestingDataSetHandler.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.etlserver.registrator;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/TestingDataSetHandlerExpectations.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/TestingDataSetHandlerExpectations.java
index b5de4ef853b..4a7b11fac46 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/TestingDataSetHandlerExpectations.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/TestingDataSetHandlerExpectations.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.etlserver.registrator;
 
 import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/TestingDataSetHandlerJavaV2.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/TestingDataSetHandlerJavaV2.java
index 67557378185..9e9842ba141 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/TestingDataSetHandlerJavaV2.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/TestingDataSetHandlerJavaV2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/TestingDataSetHandlerV2.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/TestingDataSetHandlerV2.java
index 8a13b3dad9f..b9ff8b7ddde 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/TestingDataSetHandlerV2.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/TestingDataSetHandlerV2.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.etlserver.registrator;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/impl/RollbackStackTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/impl/RollbackStackTest.java
index b293ca35bbe..c8cfbba36ac 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/impl/RollbackStackTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/impl/RollbackStackTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.impl;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/AbstractTestWithRollbackStack.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/AbstractTestWithRollbackStack.java
index a4de524f0df..311ba4871e0 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/AbstractTestWithRollbackStack.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/AbstractTestWithRollbackStack.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransactionTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransactionTest.java
index 47e1a28588f..35060b6cf35 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransactionTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransactionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetTest.java
index b7f22c30de1..56612a5b42d 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExceptionThrowingStorageProcessor.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExceptionThrowingStorageProcessor.java
index 720c4cd8ab5..2c1c63e4174 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExceptionThrowingStorageProcessor.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExceptionThrowingStorageProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/FileCommandsTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/FileCommandsTest.java
index c4add954945..7fcd51cdb9b 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/FileCommandsTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/FileCommandsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v2/AlignmentJavaDataSetRegistrationDropboxV2.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v2/AlignmentJavaDataSetRegistrationDropboxV2.java
index 53966329f1b..cb1dafa709d 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v2/AlignmentJavaDataSetRegistrationDropboxV2.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v2/AlignmentJavaDataSetRegistrationDropboxV2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v2/ExampleJavaDataSetRegistrationDropboxV2.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v2/ExampleJavaDataSetRegistrationDropboxV2.java
index 66d0446e080..029d35f940c 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v2/ExampleJavaDataSetRegistrationDropboxV2.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v2/ExampleJavaDataSetRegistrationDropboxV2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.registrator.api.v2;
 
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v2.ISampleImmutable;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForDataAcquisitionTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForDataAcquisitionTest.java
index 4ab98db8d3b..0c9314e4760 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForDataAcquisitionTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForDataAcquisitionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.threev;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForImageAnalysisTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForImageAnalysisTest.java
index 4b4330019a0..0e4f9568fb9 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForImageAnalysisTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForImageAnalysisTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.threev;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/utils/FileScannerTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/utils/FileScannerTest.java
index e0a7e9af8f1..79cda195926 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/utils/FileScannerTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/utils/FileScannerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.utils;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/utils/PreRegistrationExecutorTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/utils/PreRegistrationExecutorTest.java
index 573480d6fe6..62d9245d02d 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/utils/PreRegistrationExecutorTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/utils/PreRegistrationExecutorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.utils;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/utils/TabSeparatedValueTableTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/utils/TabSeparatedValueTableTest.java
index 6de01538955..91e1b45bde3 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/utils/TabSeparatedValueTableTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/utils/TabSeparatedValueTableTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.utils;
 
 import java.io.StringReader;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/utils/TableBuilderTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/utils/TableBuilderTest.java
index 85f389b0084..813f11140fc 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/utils/TableBuilderTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/utils/TableBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.utils;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/ColumnDefinitionTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/ColumnDefinitionTest.java
index c7eca18b91f..45a0bc1dd32 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/ColumnDefinitionTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/ColumnDefinitionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.validation;
 
 import java.util.Properties;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/DataSetValidatorForTSVTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/DataSetValidatorForTSVTest.java
index 860fadabf4c..f98f7b27fd6 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/DataSetValidatorForTSVTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/DataSetValidatorForTSVTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.validation;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/DataSetValidatorTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/DataSetValidatorTest.java
index 0f6a9971591..6817889b26d 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/DataSetValidatorTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/DataSetValidatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.validation;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/HeaderBasedValueValidatorFactoryTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/HeaderBasedValueValidatorFactoryTest.java
index 84fe4ac1d4c..ceadbe52b02 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/HeaderBasedValueValidatorFactoryTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/HeaderBasedValueValidatorFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.validation;
 
 import static ch.systemsx.cisd.etlserver.validation.HeaderBasedValueValidatorFactory.HEADER_PATTERN_KEY;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/NumericValidatorFactoryTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/NumericValidatorFactoryTest.java
index 9f0f4e00dae..95eb47d4816 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/NumericValidatorFactoryTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/NumericValidatorFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.validation;
 
 import java.util.Properties;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/StringValidatorFactoryTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/StringValidatorFactoryTest.java
index 36dfafc5c19..b73cf809952 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/StringValidatorFactoryTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/StringValidatorFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.validation;
 
 import java.util.Properties;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/UniqueGroupValidatorFactoryTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/UniqueGroupValidatorFactoryTest.java
index 51f3af8da1f..4b9e2ad8cbb 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/UniqueGroupValidatorFactoryTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/UniqueGroupValidatorFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.validation;
 
 import java.util.Properties;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/UniqueValidatorFactoryTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/UniqueValidatorFactoryTest.java
index 859d4c2eec8..2efe18f4f37 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/UniqueValidatorFactoryTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/etlserver/validation/UniqueValidatorFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.etlserver.validation;
 
 import java.util.Properties;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/DependencyCheckingTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/DependencyCheckingTest.java
index 346ea4d5d22..067cb4bc583 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/DependencyCheckingTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/DependencyCheckingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver;
 
 import org.testng.annotations.Test;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/AbstractQueryFacadeTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/AbstractQueryFacadeTest.java
index 9b12bdc166a..c6f3d87620c 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/AbstractQueryFacadeTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/AbstractQueryFacadeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/AlwaysStopCondition.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/AlwaysStopCondition.java
index 2d5dc421f91..8aaf5016b9a 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/AlwaysStopCondition.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/AlwaysStopCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 /**
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/AndStopCondition.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/AndStopCondition.java
index 32eb0c482a6..4860a9d3351 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/AndStopCondition.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/AndStopCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 /**
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/AttachmentsDropboxTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/AttachmentsDropboxTest.java
index 5d676524217..ade1a9edc1a 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/AttachmentsDropboxTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/AttachmentsDropboxTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/ContainsCondition.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/ContainsCondition.java
index 20a425cbcc4..3bfa2b95a52 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/ContainsCondition.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/ContainsCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 /**
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/CountStopCondition.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/CountStopCondition.java
index a88bf2d5136..57eb81f9164 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/CountStopCondition.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/CountStopCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 ETH Zuerich, SIS
+ * Copyright ETH 2020 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 import java.text.SimpleDateFormat;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/CreateSpacesFromDssSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/CreateSpacesFromDssSystemTest.java
index 3b12db2333c..5cd4e826310 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/CreateSpacesFromDssSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/CreateSpacesFromDssSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DropBoxFailsCondition.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DropBoxFailsCondition.java
index 80690c857f2..e865c5ee061 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DropBoxFailsCondition.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DropBoxFailsCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 /**
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DropBoxNameCondition.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DropBoxNameCondition.java
index 07f7ca8de69..380a0d5b70e 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DropBoxNameCondition.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DropBoxNameCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 /**
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DropBoxSuccessfullyFinishedCondition.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DropBoxSuccessfullyFinishedCondition.java
index e7c615bcba8..d323c7a7c12 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DropBoxSuccessfullyFinishedCondition.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DropBoxSuccessfullyFinishedCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 /**
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DssComponentTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DssComponentTest.java
index 8a6804f227b..8c9cd9010b8 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DssComponentTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DssComponentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 import java.io.ByteArrayOutputStream;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/ErrorStopCondition.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/ErrorStopCondition.java
index 0ba8618f8be..d667385e45d 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/ErrorStopCondition.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/ErrorStopCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 /**
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/FeatureRichDataSetImportSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/FeatureRichDataSetImportSystemTest.java
index ddf29c003d2..af9ec53c600 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/FeatureRichDataSetImportSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/FeatureRichDataSetImportSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/GenericDropboxSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/GenericDropboxSystemTest.java
index fdc64921d01..df6d4e8276c 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/GenericDropboxSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/GenericDropboxSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/GenericSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/GenericSystemTest.java
index d6b3dc4d1f3..35f13a08f32 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/GenericSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/GenericSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 import ch.systemsx.cisd.openbis.generic.server.api.v1.ResourceNames;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/ILogMonitoringStopCondition.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/ILogMonitoringStopCondition.java
index 97a35e121e0..065cae6e9cf 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/ILogMonitoringStopCondition.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/ILogMonitoringStopCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 /**
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/JavaDropboxSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/JavaDropboxSystemTest.java
index 85184a3f170..f472354c552 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/JavaDropboxSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/JavaDropboxSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/JsonDssServiceRpcGenericTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/JsonDssServiceRpcGenericTest.java
index 5b000fbffa4..0ec9bd377c1 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/JsonDssServiceRpcGenericTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/JsonDssServiceRpcGenericTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/LinkDataSetImportSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/LinkDataSetImportSystemTest.java
index 6857a123773..a1d357ce9af 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/LinkDataSetImportSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/LinkDataSetImportSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/LogMonitoringStopConditionBuilder.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/LogMonitoringStopConditionBuilder.java
index 6f7e688f1d4..d66e8eba141 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/LogMonitoringStopConditionBuilder.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/LogMonitoringStopConditionBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, SIS
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 /**
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/MaterialWithLoopLikeDependenciesSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/MaterialWithLoopLikeDependenciesSystemTest.java
index 2aa87de34fc..ffac6a41726 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/MaterialWithLoopLikeDependenciesSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/MaterialWithLoopLikeDependenciesSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/MutableTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/MutableTest.java
index aea38a97cbf..418c5ec940d 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/MutableTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/MutableTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/MutableV1Test.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/MutableV1Test.java
index 7cfbc232c8a..47da1c20c26 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/MutableV1Test.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/MutableV1Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/MutableV2Test.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/MutableV2Test.java
index 31c016bc9f7..9edfbd1e996 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/MutableV2Test.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/MutableV2Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/OaipmhServletTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/OaipmhServletTest.java
index 971f853bfd8..fdcfec8bb85 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/OaipmhServletTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/OaipmhServletTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/OpenbisServiceFacadeTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/OpenbisServiceFacadeTest.java
index a0a98a896c9..fc2f5ebce4e 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/OpenbisServiceFacadeTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/OpenbisServiceFacadeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 import java.io.ByteArrayOutputStream;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/OrStopCondition.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/OrStopCondition.java
index d6fdda9d6b5..fac2f38f4d6 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/OrStopCondition.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/OrStopCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 /**
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/ParsedLogEntry.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/ParsedLogEntry.java
index 577fd1f0cf5..21c8f4556b1 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/ParsedLogEntry.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/ParsedLogEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, SIS
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 import java.text.MessageFormat;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/PathInfoDatabaseTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/PathInfoDatabaseTest.java
index 1fafdaaef52..c3fe8553ebf 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/PathInfoDatabaseTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/PathInfoDatabaseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 import java.sql.Connection;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/QueryApiJsonDssServiceRpcGenericTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/QueryApiJsonDssServiceRpcGenericTest.java
index 2c6cecfcee5..0078330df92 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/QueryApiJsonDssServiceRpcGenericTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/QueryApiJsonDssServiceRpcGenericTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 import java.io.IOException;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/QueryFacadeTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/QueryFacadeTest.java
index 650abb3321a..72007c2c4db 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/QueryFacadeTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/QueryFacadeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/RegexCondition.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/RegexCondition.java
index 0ace6522ef9..2fc49b1e543 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/RegexCondition.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/RegexCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 import java.util.regex.Pattern;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SampleBatchImportBenchmarkSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SampleBatchImportBenchmarkSystemTest.java
index 5393a3dd18b..317626c3a0c 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SampleBatchImportBenchmarkSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SampleBatchImportBenchmarkSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SearchServiceTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SearchServiceTest.java
index 36ef516e926..946082355ec 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SearchServiceTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SearchServiceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/ServiceConversationTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/ServiceConversationTest.java
index d2a1bb44825..64dea5d7fcf 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/ServiceConversationTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/ServiceConversationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 import java.io.IOException;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SystemTestCase.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SystemTestCase.java
index b40e9847229..e9a3ecb9fe7 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SystemTestCase.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/SystemTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 import static ch.systemsx.cisd.openbis.dss.generic.shared.utils.DssPropertyParametersUtil.DOWNLOAD_URL_KEY;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/VocabularyDropboxApiSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/VocabularyDropboxApiSystemTest.java
index 245203f0126..2a9c7d7a446 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/VocabularyDropboxApiSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/VocabularyDropboxApiSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/CommonAuthorizationSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/CommonAuthorizationSystemTest.java
index d8ee918e31c..b7f29cf4b18 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/CommonAuthorizationSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/CommonAuthorizationSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization;
 
 import java.lang.reflect.Method;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/ProjectAuthorizationUser.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/ProjectAuthorizationUser.java
index a1801948263..7942b6ce5d9 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/ProjectAuthorizationUser.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/ProjectAuthorizationUser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization;
 
 import static ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.CommonAuthorizationSystemTest.AUTH_PROJECT_1;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/DataSetCodeUtil.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/DataSetCodeUtil.java
index a3f5a64dbb9..b0facca4e69 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/DataSetCodeUtil.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/DataSetCodeUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.common;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.CommonAuthorizationSystemTest;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/DataSetTechIdUtil.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/DataSetTechIdUtil.java
index 70821ab57e7..7f69b7d8143 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/DataSetTechIdUtil.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/DataSetTechIdUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.common;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.CommonAuthorizationSystemTest;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/DataSetUtil.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/DataSetUtil.java
index 83963d7b235..f972c04dd26 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/DataSetUtil.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/DataSetUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.common;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.CommonAuthorizationSystemTest;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/DeletionUtil.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/DeletionUtil.java
index 4dc27f16d43..4a98c70a4ce 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/DeletionUtil.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/DeletionUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.common;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.CommonAuthorizationSystemTest;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/ExperimentIdentifierUtil.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/ExperimentIdentifierUtil.java
index 18ec2e1c9a5..6df1c385e3d 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/ExperimentIdentifierUtil.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/ExperimentIdentifierUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.common;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.CommonAuthorizationSystemTest;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/ExternalDataUtil.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/ExternalDataUtil.java
index 6329bd75dde..e44076bbd1e 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/ExternalDataUtil.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/ExternalDataUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.common;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.CommonAuthorizationSystemTest;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/SampleIdentifierUtil.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/SampleIdentifierUtil.java
index 2ae39593102..c28ebad992f 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/SampleIdentifierUtil.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/SampleIdentifierUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.common;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.CommonAuthorizationSystemTest;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/SamplePermIdUtil.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/SamplePermIdUtil.java
index 62ee9c8d379..54099364388 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/SamplePermIdUtil.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/SamplePermIdUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.common;
 
 import ch.systemsx.cisd.common.exceptions.AuthorizationFailureException;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/SampleTechIdUtil.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/SampleTechIdUtil.java
index e71b21211c0..770d1cbad3f 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/SampleTechIdUtil.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/SampleTechIdUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.common;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.CommonAuthorizationSystemTest;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/SampleUtil.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/SampleUtil.java
index 9fc92486745..3c37913c166 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/SampleUtil.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/SampleUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.common;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.CommonAuthorizationSystemTest;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/SampleV1Util.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/SampleV1Util.java
index ce8ea13e511..5abaa20e3da 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/SampleV1Util.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/common/SampleV1Util.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.common;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.CommonAuthorizationSystemTest;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/CommonPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/CommonPredicateSystemTest.java
index 160e2273dc4..e9668cde88f 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/CommonPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/CommonPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/CommonPredicateSystemTestAssertions.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/CommonPredicateSystemTestAssertions.java
index b86a0947e51..2c0c19c610c 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/CommonPredicateSystemTestAssertions.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/CommonPredicateSystemTestAssertions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/CommonPredicateSystemTestAssertionsDefault.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/CommonPredicateSystemTestAssertionsDefault.java
index 926819bbe22..0affdba12bb 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/CommonPredicateSystemTestAssertionsDefault.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/CommonPredicateSystemTestAssertionsDefault.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate;
 
 import static ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.CommonAuthorizationSystemTest.AUTH_PROJECT_1;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/CommonPredicateSystemTestAssertionsDelegate.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/CommonPredicateSystemTestAssertionsDelegate.java
index e1f8d89d11b..ca5689c4856 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/CommonPredicateSystemTestAssertionsDelegate.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/CommonPredicateSystemTestAssertionsDelegate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/CommonPredicateSystemTestDataSetAssertions.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/CommonPredicateSystemTestDataSetAssertions.java
index 3075ba64d5b..2d1b03cf034 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/CommonPredicateSystemTestDataSetAssertions.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/CommonPredicateSystemTestDataSetAssertions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate;
 
 import static ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.CommonAuthorizationSystemTest.AUTH_PROJECT_1;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/CommonPredicateSystemTestSampleAssertions.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/CommonPredicateSystemTestSampleAssertions.java
index 99c4e528c57..3a3e31660e3 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/CommonPredicateSystemTestSampleAssertions.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/CommonPredicateSystemTestSampleAssertions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate;
 
 import static ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.CommonAuthorizationSystemTest.AUTH_PROJECT_1;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/CommonPredicateSystemTestSpaceAssertions.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/CommonPredicateSystemTestSpaceAssertions.java
index ac6ef6a1399..2bc7d60740a 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/CommonPredicateSystemTestSpaceAssertions.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/CommonPredicateSystemTestSpaceAssertions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate;
 
 import static ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.CommonAuthorizationSystemTest.AUTH_PROJECT_1;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataPEPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataPEPredicateSystemTest.java
index f1dcc54d5e8..337512d88f9 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataPEPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataPEPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.dataset;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetCodeCollectionPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetCodeCollectionPredicateSystemTest.java
index a9d3dfc4b13..fea8a9a0cb5 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetCodeCollectionPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetCodeCollectionPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.dataset;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetCodePredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetCodePredicateSystemTest.java
index 39d000fe4b6..8b62bfead76 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetCodePredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetCodePredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.dataset;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetTechIdCollectionPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetTechIdCollectionPredicateSystemTest.java
index f911300d4d8..0780f84878b 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetTechIdCollectionPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetTechIdCollectionPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.dataset;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetTechIdPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetTechIdPredicateSystemTest.java
index b8e3fd561fd..229a02bd7f1 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetTechIdPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetTechIdPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.dataset;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesCollectionPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesCollectionPredicateSystemTest.java
index bc4c64dca68..52c90f82b9a 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesCollectionPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesCollectionPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.dataset;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesCollectionPredicateWithDataSetTechIdSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesCollectionPredicateWithDataSetTechIdSystemTest.java
index 814e3d1d8ac..18fc9d53356 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesCollectionPredicateWithDataSetTechIdSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesCollectionPredicateWithDataSetTechIdSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.dataset;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.common.DataSetTechIdUtil;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesCollectionPredicateWithExperimentIdentifierSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesCollectionPredicateWithExperimentIdentifierSystemTest.java
index 8e4d164b8d1..0d76f79fe65 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesCollectionPredicateWithExperimentIdentifierSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesCollectionPredicateWithExperimentIdentifierSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.dataset;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesCollectionPredicateWithSampleIdentifierSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesCollectionPredicateWithSampleIdentifierSystemTest.java
index 8a4d9697d04..49556ad729a 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesCollectionPredicateWithSampleIdentifierSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesCollectionPredicateWithSampleIdentifierSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.dataset;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesPredicateSystemTest.java
index d400f35bdd0..26e1a29aae6 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.dataset;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesPredicateWithDataSetTechIdSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesPredicateWithDataSetTechIdSystemTest.java
index 5ff10fed68c..83dca4e0bd3 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesPredicateWithDataSetTechIdSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesPredicateWithDataSetTechIdSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.dataset;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.common.DataSetTechIdUtil;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesPredicateWithExperimentIdentifierSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesPredicateWithExperimentIdentifierSystemTest.java
index d95e66fa79d..533c8898995 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesPredicateWithExperimentIdentifierSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesPredicateWithExperimentIdentifierSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.dataset;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesPredicateWithSampleIdentifierSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesPredicateWithSampleIdentifierSystemTest.java
index 6b7511dc745..0e78909b372 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesPredicateWithSampleIdentifierSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/DataSetUpdatesPredicateWithSampleIdentifierSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.dataset;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewDataSetsWithTypePredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewDataSetsWithTypePredicateSystemTest.java
index b37251b6f9e..1a1418699b3 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewDataSetsWithTypePredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewDataSetsWithTypePredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.dataset;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewDataSetsWithTypePredicateWithContainerIdentifierSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewDataSetsWithTypePredicateWithContainerIdentifierSystemTest.java
index c32918d71ab..395c5cb5038 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewDataSetsWithTypePredicateWithContainerIdentifierSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewDataSetsWithTypePredicateWithContainerIdentifierSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.dataset;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewDataSetsWithTypePredicateWithDataSetCodeSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewDataSetsWithTypePredicateWithDataSetCodeSystemTest.java
index 5d27c31c8fb..d9ac375ae7d 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewDataSetsWithTypePredicateWithDataSetCodeSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewDataSetsWithTypePredicateWithDataSetCodeSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.dataset;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewDataSetsWithTypePredicateWithExperimentIdentifierSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewDataSetsWithTypePredicateWithExperimentIdentifierSystemTest.java
index 24ae61a7699..a3ba4a12937 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewDataSetsWithTypePredicateWithExperimentIdentifierSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewDataSetsWithTypePredicateWithExperimentIdentifierSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.dataset;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewDataSetsWithTypePredicateWithParentIdentifiersSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewDataSetsWithTypePredicateWithParentIdentifiersSystemTest.java
index 5efcb45c037..327c3283e96 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewDataSetsWithTypePredicateWithParentIdentifiersSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewDataSetsWithTypePredicateWithParentIdentifiersSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.dataset;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewDataSetsWithTypePredicateWithSampleIdentifierSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewDataSetsWithTypePredicateWithSampleIdentifierSystemTest.java
index b3c22155c30..aa0e82703af 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewDataSetsWithTypePredicateWithSampleIdentifierSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewDataSetsWithTypePredicateWithSampleIdentifierSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.dataset;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewExternalDataPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewExternalDataPredicateSystemTest.java
index c5b6ad1ce40..b22eac85e3b 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewExternalDataPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewExternalDataPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.dataset;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewExternalDataPredicateWithExperimentIdentifierSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewExternalDataPredicateWithExperimentIdentifierSystemTest.java
index 76e44cbe830..7ff72f02d35 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewExternalDataPredicateWithExperimentIdentifierSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewExternalDataPredicateWithExperimentIdentifierSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.dataset;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewExternalDataPredicateWithParentDataSetCodesSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewExternalDataPredicateWithParentDataSetCodesSystemTest.java
index 43f0a39e4fa..b94107cff58 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewExternalDataPredicateWithParentDataSetCodesSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewExternalDataPredicateWithParentDataSetCodesSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.dataset;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewExternalDataPredicateWithSampleIdentifierSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewExternalDataPredicateWithSampleIdentifierSystemTest.java
index 2953f8fcf1b..97384c4fbd2 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewExternalDataPredicateWithSampleIdentifierSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewExternalDataPredicateWithSampleIdentifierSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.dataset;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewExternalDataPredicateWithSamplePermIdSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewExternalDataPredicateWithSamplePermIdSystemTest.java
index 435f21e92f7..7663f122bf5 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewExternalDataPredicateWithSamplePermIdSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/dataset/NewExternalDataPredicateWithSamplePermIdSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.dataset;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/DeletionTechIdCollectionPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/DeletionTechIdCollectionPredicateSystemTest.java
index afc0da6805e..aeb7898a239 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/DeletionTechIdCollectionPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/DeletionTechIdCollectionPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.deletion;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/DeletionTechIdCollectionPredicateWithDataSetSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/DeletionTechIdCollectionPredicateWithDataSetSystemTest.java
index 89d5f2bcb4d..c6f0d104394 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/DeletionTechIdCollectionPredicateWithDataSetSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/DeletionTechIdCollectionPredicateWithDataSetSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.deletion;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.common.DeletionUtil;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/DeletionTechIdCollectionPredicateWithExperimentSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/DeletionTechIdCollectionPredicateWithExperimentSystemTest.java
index b6c5a9fe164..c0109e7c059 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/DeletionTechIdCollectionPredicateWithExperimentSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/DeletionTechIdCollectionPredicateWithExperimentSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.deletion;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.common.DeletionUtil;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/DeletionTechIdCollectionPredicateWithSampleSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/DeletionTechIdCollectionPredicateWithSampleSystemTest.java
index bb955fbb4d2..9236c7650ca 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/DeletionTechIdCollectionPredicateWithSampleSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/DeletionTechIdCollectionPredicateWithSampleSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.deletion;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.common.DeletionUtil;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/RevertDeletionPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/RevertDeletionPredicateSystemTest.java
index 933ab2ca7a9..9f6b2084867 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/RevertDeletionPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/RevertDeletionPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.deletion;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/RevertDeletionPredicateWithDataSetSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/RevertDeletionPredicateWithDataSetSystemTest.java
index f894f94f7d9..7687080e8d0 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/RevertDeletionPredicateWithDataSetSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/RevertDeletionPredicateWithDataSetSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.deletion;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.common.DeletionUtil;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/RevertDeletionPredicateWithExperimentSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/RevertDeletionPredicateWithExperimentSystemTest.java
index 0f7dd79ef70..b094f5881c3 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/RevertDeletionPredicateWithExperimentSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/RevertDeletionPredicateWithExperimentSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.deletion;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.common.DeletionUtil;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/RevertDeletionPredicateWithSampleSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/RevertDeletionPredicateWithSampleSystemTest.java
index a25b76496b0..25f1091a5be 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/RevertDeletionPredicateWithSampleSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/RevertDeletionPredicateWithSampleSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.deletion;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.common.DeletionUtil;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/V3DeletionIdPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/V3DeletionIdPredicateSystemTest.java
index e405c5eb9d3..1fc014edcef 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/V3DeletionIdPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/V3DeletionIdPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.deletion;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/V3DeletionIdPredicateWithDataSetSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/V3DeletionIdPredicateWithDataSetSystemTest.java
index 33ca88252dc..d4733f2619b 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/V3DeletionIdPredicateWithDataSetSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/V3DeletionIdPredicateWithDataSetSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.deletion;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.id.DeletionTechId;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/V3DeletionIdPredicateWithExperimentSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/V3DeletionIdPredicateWithExperimentSystemTest.java
index 52886205292..368ce646786 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/V3DeletionIdPredicateWithExperimentSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/V3DeletionIdPredicateWithExperimentSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.deletion;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.id.DeletionTechId;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/V3DeletionIdPredicateWithSampleSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/V3DeletionIdPredicateWithSampleSystemTest.java
index 9f4c7559039..37a4c442f61 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/V3DeletionIdPredicateWithSampleSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/deletion/V3DeletionIdPredicateWithSampleSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.deletion;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.id.DeletionTechId;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateSystemTest.java
index 1c42fc05b2a..02fd804e52c 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.entity;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithDataSetRegistrationSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithDataSetRegistrationSystemTest.java
index 00abeb3847e..c449c42d54b 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithDataSetRegistrationSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithDataSetRegistrationSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.entity;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.common.ExperimentIdentifierUtil;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithDataSetUpdateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithDataSetUpdateSystemTest.java
index 80416748172..275ffeaf987 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithDataSetUpdateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithDataSetUpdateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.entity;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithExperimentRegistrationSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithExperimentRegistrationSystemTest.java
index 9fe9ddcf3a0..fd448a7d7aa 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithExperimentRegistrationSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithExperimentRegistrationSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.entity;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewExperiment;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithExperimentUpdateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithExperimentUpdateSystemTest.java
index 450cbf05bfd..f25ed029a5f 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithExperimentUpdateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithExperimentUpdateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.entity;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithProjectRegistrationSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithProjectRegistrationSystemTest.java
index 5a039aadf77..5fb48264456 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithProjectRegistrationSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithProjectRegistrationSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.entity;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewProject;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithProjectUpdateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithProjectUpdateSystemTest.java
index 7e7903395e9..58cc53bc7ec 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithProjectUpdateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithProjectUpdateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.entity;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithSampleRegistrationSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithSampleRegistrationSystemTest.java
index 8931fb0f341..6d7873d8b7b 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithSampleRegistrationSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithSampleRegistrationSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.entity;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithSampleUpdateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithSampleUpdateSystemTest.java
index 6ee3b8ffabe..aa46b28a1b8 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithSampleUpdateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/AtomicOperationsPredicateWithSampleUpdateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.entity;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.common.SampleTechIdUtil;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/BasicEntityDescriptionPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/BasicEntityDescriptionPredicateSystemTest.java
index f91b5407507..b8dd920cb2d 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/BasicEntityDescriptionPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/BasicEntityDescriptionPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.entity;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/BasicEntityDescriptionPredicateWithDataSetSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/BasicEntityDescriptionPredicateWithDataSetSystemTest.java
index f111fbdf8fa..cef1d45b43f 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/BasicEntityDescriptionPredicateWithDataSetSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/BasicEntityDescriptionPredicateWithDataSetSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.entity;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.common.DataSetCodeUtil;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/BasicEntityDescriptionPredicateWithExperimentSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/BasicEntityDescriptionPredicateWithExperimentSystemTest.java
index 12a7b7a15ea..f1f00d4f811 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/BasicEntityDescriptionPredicateWithExperimentSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/BasicEntityDescriptionPredicateWithExperimentSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.entity;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/BasicEntityDescriptionPredicateWithSampleSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/BasicEntityDescriptionPredicateWithSampleSystemTest.java
index 180b7ea9695..58e46fae4a6 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/BasicEntityDescriptionPredicateWithSampleSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/entity/BasicEntityDescriptionPredicateWithSampleSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.entity;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentAugmentedCodePredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentAugmentedCodePredicateSystemTest.java
index 7315944acea..b68adb81aea 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentAugmentedCodePredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentAugmentedCodePredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.experiment;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentIdPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentIdPredicateSystemTest.java
index 79dd01571aa..93dd7bb54dc 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentIdPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentIdPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.experiment;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentIdPredicateWithAugmentedCodeSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentIdPredicateWithAugmentedCodeSystemTest.java
index 505aea537cb..c674f54e4a6 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentIdPredicateWithAugmentedCodeSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentIdPredicateWithAugmentedCodeSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.experiment;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentIdPredicateWithPermIdSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentIdPredicateWithPermIdSystemTest.java
index 08fa832272c..dade6580046 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentIdPredicateWithPermIdSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentIdPredicateWithPermIdSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.experiment;
 
 import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.id.experiment.ExperimentPermIdId;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentIdPredicateWithTechIdSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentIdPredicateWithTechIdSystemTest.java
index 01168a38e81..c9c28cfc301 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentIdPredicateWithTechIdSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentIdPredicateWithTechIdSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.experiment;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentListPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentListPredicateSystemTest.java
index 52f5b71aa94..7b4082b7b9d 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentListPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentListPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.experiment;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentPEOrNullPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentPEOrNullPredicateSystemTest.java
index 878401e3b1f..9fd920fe97c 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentPEOrNullPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentPEOrNullPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.experiment;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentPEPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentPEPredicateSystemTest.java
index 5ddb08586c1..9f60b89352f 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentPEPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentPEPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.experiment;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentPermIdPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentPermIdPredicateSystemTest.java
index f5f736bdefb..5e9d6eb61fd 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentPermIdPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentPermIdPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.experiment;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentTechIdCollectionPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentTechIdCollectionPredicateSystemTest.java
index e6cbd15e179..ee9dae0fcb7 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentTechIdCollectionPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentTechIdCollectionPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.experiment;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentTechIdPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentTechIdPredicateSystemTest.java
index 85a80c818d0..ce2619348f1 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentTechIdPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentTechIdPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.experiment;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentUpdatesPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentUpdatesPredicateSystemTest.java
index 02912300745..d32a11f8a3e 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentUpdatesPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentUpdatesPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.experiment;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentUpdatesPredicateWithExperimentTechIdSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentUpdatesPredicateWithExperimentTechIdSystemTest.java
index 4cfe68d40ec..eca9678f4bb 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentUpdatesPredicateWithExperimentTechIdSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentUpdatesPredicateWithExperimentTechIdSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.experiment;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentUpdatesPredicateWithProjectIdentifierSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentUpdatesPredicateWithProjectIdentifierSystemTest.java
index 7ea3013f2b5..c5840b2e9ac 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentUpdatesPredicateWithProjectIdentifierSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/ExperimentUpdatesPredicateWithProjectIdentifierSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.experiment;
 
 import java.util.HashSet;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/NewExperimentPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/NewExperimentPredicateSystemTest.java
index f28ac501f66..455f3414975 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/NewExperimentPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/NewExperimentPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.experiment;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/NewExperimentsWithTypePredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/NewExperimentsWithTypePredicateSystemTest.java
index e47e18e5a1f..b40ff5213a3 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/NewExperimentsWithTypePredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/NewExperimentsWithTypePredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.experiment;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/UpdatedExperimentsWithTypePredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/UpdatedExperimentsWithTypePredicateSystemTest.java
index 28df66be2dd..0ed4aa9b4d2 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/UpdatedExperimentsWithTypePredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/experiment/UpdatedExperimentsWithTypePredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.experiment;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/NewProjectPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/NewProjectPredicateSystemTest.java
index 43c45aff113..0754f4edc99 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/NewProjectPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/NewProjectPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.project;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectAugmentedCodePredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectAugmentedCodePredicateSystemTest.java
index 34aebc2bd39..a690cc94a65 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectAugmentedCodePredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectAugmentedCodePredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.project;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectIdPredicateWithIdentifierSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectIdPredicateWithIdentifierSystemTest.java
index fabf19b19d4..d94af258111 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectIdPredicateWithIdentifierSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectIdPredicateWithIdentifierSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.project;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectIdPredicateWithPermIdSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectIdPredicateWithPermIdSystemTest.java
index ee242b446d1..4b5f2508e38 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectIdPredicateWithPermIdSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectIdPredicateWithPermIdSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.project;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectIdPredicateWithTechIdSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectIdPredicateWithTechIdSystemTest.java
index 8acec6ef227..79158441aa1 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectIdPredicateWithTechIdSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectIdPredicateWithTechIdSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.project;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectIdentifierExistingSpacePredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectIdentifierExistingSpacePredicateSystemTest.java
index 65e397ac27f..d8e200156cf 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectIdentifierExistingSpacePredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectIdentifierExistingSpacePredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.project;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectIdentifierPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectIdentifierPredicateSystemTest.java
index 24df33709f1..ea2583100a9 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectIdentifierPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectIdentifierPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.project;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectPEPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectPEPredicateSystemTest.java
index 83d6b570054..3a7c38e9bc9 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectPEPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectPEPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.project;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectPermIdPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectPermIdPredicateSystemTest.java
index d691ab16b3f..783c6a82fd1 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectPermIdPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectPermIdPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.project;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectPermIdStringPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectPermIdStringPredicateSystemTest.java
index 4bde9d121a1..b318d391162 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectPermIdStringPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectPermIdStringPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.project;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectPredicateSystemTest.java
index 5c3e0bb375e..8b65506526a 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.project;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectTechIdCollectionPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectTechIdCollectionPredicateSystemTest.java
index 551dbb849a4..f7bc11b7237 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectTechIdCollectionPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectTechIdCollectionPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.project;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectTechIdPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectTechIdPredicateSystemTest.java
index 631b83dbff1..cc3d99ee46c 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectTechIdPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectTechIdPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.project;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectUpdatesPredicateWithIdentifierSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectUpdatesPredicateWithIdentifierSystemTest.java
index b6b864fd92f..b8a3dd2a00f 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectUpdatesPredicateWithIdentifierSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectUpdatesPredicateWithIdentifierSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.project;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectUpdatesPredicateWithPermIdSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectUpdatesPredicateWithPermIdSystemTest.java
index 6eae9601490..d4e49ff16d3 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectUpdatesPredicateWithPermIdSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectUpdatesPredicateWithPermIdSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.project;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectUpdatesPredicateWithTechIdSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectUpdatesPredicateWithTechIdSystemTest.java
index ea89d570b7d..aa1e229155a 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectUpdatesPredicateWithTechIdSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/project/ProjectUpdatesPredicateWithTechIdSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.project;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ExistingSampleIdentifierPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ExistingSampleIdentifierPredicateSystemTest.java
index afdf4b11658..779c27b095a 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ExistingSampleIdentifierPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ExistingSampleIdentifierPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateSystemTest.java
index d5b3caa373d..8a3830f91bd 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithChildSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithChildSystemTest.java
index 09262f92949..db2edf83813 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithChildSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithChildSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithChildrenSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithChildrenSystemTest.java
index fba63745756..bf922c001fd 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithChildrenSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithChildrenSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithContainerSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithContainerSystemTest.java
index c4c2a9a3e39..0f545e74694 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithContainerSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithContainerSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithContainersSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithContainersSystemTest.java
index d3fabfcff44..9c8de01757b 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithContainersSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithContainersSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithExperimentSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithExperimentSystemTest.java
index 4c92618d144..846fbda90e6 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithExperimentSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithExperimentSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithParentSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithParentSystemTest.java
index 2303159cdd8..2d1edf60c51 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithParentSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithParentSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithSampleSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithSampleSystemTest.java
index af78946284d..79e9a01d438 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithSampleSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithSampleSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithSpaceSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithSpaceSystemTest.java
index 677481db05d..5b0f8860326 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithSpaceSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSampleCriteriaPredicateWithSpaceSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ListSampleCriteria;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSamplesByPropertyPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSamplesByPropertyPredicateSystemTest.java
index d3d9fec671b..3f98a9ff9ca 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSamplesByPropertyPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/ListSamplesByPropertyPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplePredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplePredicateSystemTest.java
index 062e8836a1f..c66460fe340 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplePredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplePredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplePredicateWithContainerIdentifierSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplePredicateWithContainerIdentifierSystemTest.java
index 4dba7c075dc..ff338f34f2e 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplePredicateWithContainerIdentifierSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplePredicateWithContainerIdentifierSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.common.SampleIdentifierUtil;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplePredicateWithExperimentIdentifierSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplePredicateWithExperimentIdentifierSystemTest.java
index 6376c5f3fff..c96603352b8 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplePredicateWithExperimentIdentifierSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplePredicateWithExperimentIdentifierSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewSample;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplePredicateWithParentIdentifierSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplePredicateWithParentIdentifierSystemTest.java
index 35d0ebf8106..777fd55f35e 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplePredicateWithParentIdentifierSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplePredicateWithParentIdentifierSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.common.SampleIdentifierUtil;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplePredicateWithProjectIdentifierSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplePredicateWithProjectIdentifierSystemTest.java
index fda6f6fc479..bc67d6bc54f 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplePredicateWithProjectIdentifierSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplePredicateWithProjectIdentifierSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewSample;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplePredicateWithSampleIdentifierSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplePredicateWithSampleIdentifierSystemTest.java
index 9a5a37fee23..3b516d81b99 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplePredicateWithSampleIdentifierSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplePredicateWithSampleIdentifierSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.common.SampleIdentifierUtil;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplePredicateWithSampleSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplePredicateWithSampleSystemTest.java
index 2dd942b146a..4c3865fb52c 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplePredicateWithSampleSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplePredicateWithSampleSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplesWithTypePredicateWithContainerIdentifierSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplesWithTypePredicateWithContainerIdentifierSystemTest.java
index 5a5dbd2b876..dfab5fdfdda 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplesWithTypePredicateWithContainerIdentifierSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplesWithTypePredicateWithContainerIdentifierSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplesWithTypePredicateWithExperimentIdentifierSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplesWithTypePredicateWithExperimentIdentifierSystemTest.java
index 5d26d59157c..3fcc065620f 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplesWithTypePredicateWithExperimentIdentifierSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplesWithTypePredicateWithExperimentIdentifierSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplesWithTypePredicateWithParentIdentifierSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplesWithTypePredicateWithParentIdentifierSystemTest.java
index 3eb4a6e686f..47850d360ad 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplesWithTypePredicateWithParentIdentifierSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplesWithTypePredicateWithParentIdentifierSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplesWithTypePredicateWithProjectIdentifierSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplesWithTypePredicateWithProjectIdentifierSystemTest.java
index 9e6ad07ad96..a45fbba4c6e 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplesWithTypePredicateWithProjectIdentifierSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplesWithTypePredicateWithProjectIdentifierSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplesWithTypePredicateWithSampleIdentifierSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplesWithTypePredicateWithSampleIdentifierSystemTest.java
index a087b627bfb..ef9f99590d1 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplesWithTypePredicateWithSampleIdentifierSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/NewSamplesWithTypePredicateWithSampleIdentifierSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleAugmentedCodePredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleAugmentedCodePredicateSystemTest.java
index 6bcb5c02c9e..8dec4fd4b5c 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleAugmentedCodePredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleAugmentedCodePredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleIdPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleIdPredicateSystemTest.java
index 5990a6c25f3..b215c3161ed 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleIdPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleIdPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleIdPredicateWithSampleIdentifierSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleIdPredicateWithSampleIdentifierSystemTest.java
index 66eea0f5907..edb9ab62ec5 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleIdPredicateWithSampleIdentifierSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleIdPredicateWithSampleIdentifierSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleIdPredicateWithSamplePermIdSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleIdPredicateWithSamplePermIdSystemTest.java
index 3ea074f6869..d8527c0cdf4 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleIdPredicateWithSamplePermIdSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleIdPredicateWithSamplePermIdSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import ch.systemsx.cisd.common.exceptions.AuthorizationFailureException;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleIdPredicateWithSampleTechIdSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleIdPredicateWithSampleTechIdSystemTest.java
index 63647a2adf7..352db39c7bb 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleIdPredicateWithSampleTechIdSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleIdPredicateWithSampleTechIdSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.common.SampleTechIdUtil;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleIdentifierCollectionPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleIdentifierCollectionPredicateSystemTest.java
index 3136af16c33..7d93e89b1f0 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleIdentifierCollectionPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleIdentifierCollectionPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleIdentifierPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleIdentifierPredicateSystemTest.java
index 6f083a64db7..5bf25c402b3 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleIdentifierPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleIdentifierPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleListPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleListPredicateSystemTest.java
index 35bb3d34f9a..183a0fba772 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleListPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleListPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SamplePEOrNullPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SamplePEOrNullPredicateSystemTest.java
index f57ca5aeec0..8f2c14e8ac2 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SamplePEOrNullPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SamplePEOrNullPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SamplePEPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SamplePEPredicateSystemTest.java
index a7abbaf642b..aaf852e8b87 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SamplePEPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SamplePEPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SamplePermIdPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SamplePermIdPredicateSystemTest.java
index 78227d2734c..5ce2fe117c4 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SamplePermIdPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SamplePermIdPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SamplePermIdStringPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SamplePermIdStringPredicateSystemTest.java
index b203259e48f..518162a1d10 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SamplePermIdStringPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SamplePermIdStringPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SamplePredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SamplePredicateSystemTest.java
index faad3168208..67d110fa99a 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SamplePredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SamplePredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleTechIdCollectionPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleTechIdCollectionPredicateSystemTest.java
index 9cb3723dd19..d7bc730c2cb 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleTechIdCollectionPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleTechIdCollectionPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleTechIdCollectionReadWritePredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleTechIdCollectionReadWritePredicateSystemTest.java
index 3441c6988b1..90fca47c76c 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleTechIdCollectionReadWritePredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleTechIdCollectionReadWritePredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleTechIdPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleTechIdPredicateSystemTest.java
index 08e177462b8..c3479b08bf7 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleTechIdPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleTechIdPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleTechIdReadWritePredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleTechIdReadWritePredicateSystemTest.java
index 73b980f300a..db3e6563a09 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleTechIdReadWritePredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleTechIdReadWritePredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesCollectionPredicateWithContainerIdentifierSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesCollectionPredicateWithContainerIdentifierSystemTest.java
index 21626686658..504035112cd 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesCollectionPredicateWithContainerIdentifierSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesCollectionPredicateWithContainerIdentifierSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesCollectionPredicateWithExperimentIdentifierSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesCollectionPredicateWithExperimentIdentifierSystemTest.java
index 29f53cf7994..e517982f041 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesCollectionPredicateWithExperimentIdentifierSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesCollectionPredicateWithExperimentIdentifierSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesCollectionPredicateWithProjectIdentifierSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesCollectionPredicateWithProjectIdentifierSystemTest.java
index d89a2fb7ca6..93507c71ef7 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesCollectionPredicateWithProjectIdentifierSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesCollectionPredicateWithProjectIdentifierSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesCollectionPredicateWithSampleTechIdSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesCollectionPredicateWithSampleTechIdSystemTest.java
index d358ab39c36..ba5558cf11a 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesCollectionPredicateWithSampleTechIdSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesCollectionPredicateWithSampleTechIdSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesPredicateSystemTest.java
index b8bfbe14ee6..60a333157b5 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesPredicateWithContainerIdentifierSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesPredicateWithContainerIdentifierSystemTest.java
index b1f6b8bb184..1ad3cee25bc 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesPredicateWithContainerIdentifierSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesPredicateWithContainerIdentifierSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesPredicateWithExperimentIdentifierSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesPredicateWithExperimentIdentifierSystemTest.java
index 1a78156aa08..1fce8a3da27 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesPredicateWithExperimentIdentifierSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesPredicateWithExperimentIdentifierSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesPredicateWithProjectIdentifierSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesPredicateWithProjectIdentifierSystemTest.java
index 1befad30c57..f7ac43ca3c4 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesPredicateWithProjectIdentifierSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesPredicateWithProjectIdentifierSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesPredicateWithSampleSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesPredicateWithSampleSystemTest.java
index 7a68edac398..549739b4ba0 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesPredicateWithSampleSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesPredicateWithSampleSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.CommonPredicateSystemTestAssertions;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesPredicateWithSampleTechIdSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesPredicateWithSampleTechIdSystemTest.java
index 378893a0f22..656823d16de 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesPredicateWithSampleTechIdSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/sample/SampleUpdatesPredicateWithSampleTechIdSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.sample;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.common.SampleTechIdUtil;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/space/ExistingSpaceIdentifierOrProjectPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/space/ExistingSpaceIdentifierOrProjectPredicateSystemTest.java
index e969f166111..b86315c4fe9 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/space/ExistingSpaceIdentifierOrProjectPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/space/ExistingSpaceIdentifierOrProjectPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.space;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/space/ExistingSpaceIdentifierPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/space/ExistingSpaceIdentifierPredicateSystemTest.java
index c337820d9a9..1eba0220e22 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/space/ExistingSpaceIdentifierPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/space/ExistingSpaceIdentifierPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.space;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/space/SpaceIdentifierPredicateSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/space/SpaceIdentifierPredicateSystemTest.java
index bdd0f55f6f7..4514eb7efdf 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/space/SpaceIdentifierPredicateSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/predicate/space/SpaceIdentifierPredicateSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.predicate.space;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTest.java
index 60e49f276cb..62de58eb93b 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator;
 
 import org.testng.annotations.Test;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTestAssertions.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTestAssertions.java
index 996a81ce1f0..7f71baeecf7 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTestAssertions.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTestAssertions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTestAssertionsDefault.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTestAssertionsDefault.java
index 1fa8be989f3..3cbb233a543 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTestAssertionsDefault.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTestAssertionsDefault.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator;
 
 import static ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.CommonAuthorizationSystemTest.AUTH_PROJECT_1;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTestAssertionsDelegate.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTestAssertionsDelegate.java
index dbf2bb3dd8f..6a73a168e1f 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTestAssertionsDelegate.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTestAssertionsDelegate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTestDataSetAssertions.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTestDataSetAssertions.java
index bd59ac6b2d1..ab1c36548ea 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTestDataSetAssertions.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTestDataSetAssertions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator;
 
 import static ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.CommonAuthorizationSystemTest.AUTH_PROJECT_1;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTestMaterialAssertions.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTestMaterialAssertions.java
index 0b1f7359857..6190db2eb40 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTestMaterialAssertions.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTestMaterialAssertions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator;
 
 import static ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.CommonAuthorizationSystemTest.AUTH_PROJECT_1;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTestSampleAssertions.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTestSampleAssertions.java
index 11cfe37693d..92856397376 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTestSampleAssertions.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTestSampleAssertions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator;
 
 import static ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.CommonAuthorizationSystemTest.AUTH_PROJECT_1;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTestSpaceAssertions.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTestSpaceAssertions.java
index 1a14ce6ac3f..ebc5dc4116e 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTestSpaceAssertions.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/CommonValidatorSystemTestSpaceAssertions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator;
 
 import static ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.CommonAuthorizationSystemTest.AUTH_PROJECT_1;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/dataset/DataSetByExperimentOrSampleIdentifierValidatorSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/dataset/DataSetByExperimentOrSampleIdentifierValidatorSystemTest.java
index 99a6839ce27..feba4892369 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/dataset/DataSetByExperimentOrSampleIdentifierValidatorSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/dataset/DataSetByExperimentOrSampleIdentifierValidatorSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.dataset;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/dataset/DataSetPEByExperimentOrSampleIdentifierValidatorSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/dataset/DataSetPEByExperimentOrSampleIdentifierValidatorSystemTest.java
index accdf7cde96..9ca25788320 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/dataset/DataSetPEByExperimentOrSampleIdentifierValidatorSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/dataset/DataSetPEByExperimentOrSampleIdentifierValidatorSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.dataset;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/dataset/ExternalDataValidatorSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/dataset/ExternalDataValidatorSystemTest.java
index beb70aaf32d..84aec318c24 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/dataset/ExternalDataValidatorSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/dataset/ExternalDataValidatorSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.dataset;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/deletion/DeletionValidatorSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/deletion/DeletionValidatorSystemTest.java
index 0ebc88ae7e5..835fce5aaa1 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/deletion/DeletionValidatorSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/deletion/DeletionValidatorSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.deletion;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/deletion/DeletionValidatorWithDataSetSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/deletion/DeletionValidatorWithDataSetSystemTest.java
index b821cde3935..8d67dded08a 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/deletion/DeletionValidatorWithDataSetSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/deletion/DeletionValidatorWithDataSetSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.deletion;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.CommonValidatorSystemTestAssertions;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/deletion/DeletionValidatorWithExperimentSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/deletion/DeletionValidatorWithExperimentSystemTest.java
index edc14e33187..fac9435c8e3 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/deletion/DeletionValidatorWithExperimentSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/deletion/DeletionValidatorWithExperimentSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.deletion;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Deletion;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/deletion/DeletionValidatorWithSampleSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/deletion/DeletionValidatorWithSampleSystemTest.java
index 56bdb134ed6..012826aa65c 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/deletion/DeletionValidatorWithSampleSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/deletion/DeletionValidatorWithSampleSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.deletion;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.CommonAuthorizationSystemTest;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/EntityHistoryValidatorSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/EntityHistoryValidatorSystemTest.java
index f267d046ea8..f4d13f4f16b 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/EntityHistoryValidatorSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/EntityHistoryValidatorSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.entity;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/EntityHistoryValidatorWithDataSetSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/EntityHistoryValidatorWithDataSetSystemTest.java
index 20b99af9bdf..91286bc74de 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/EntityHistoryValidatorWithDataSetSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/EntityHistoryValidatorWithDataSetSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.entity;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.common.ExternalDataUtil;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/EntityHistoryValidatorWithExperimentSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/EntityHistoryValidatorWithExperimentSystemTest.java
index b9f21502a8a..04661976833 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/EntityHistoryValidatorWithExperimentSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/EntityHistoryValidatorWithExperimentSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.entity;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityHistory;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/EntityHistoryValidatorWithProjectSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/EntityHistoryValidatorWithProjectSystemTest.java
index c085e18f582..c52c6592dce 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/EntityHistoryValidatorWithProjectSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/EntityHistoryValidatorWithProjectSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.entity;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityHistory;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/EntityHistoryValidatorWithSampleSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/EntityHistoryValidatorWithSampleSystemTest.java
index 10d3764ff1e..8a90cb52804 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/EntityHistoryValidatorWithSampleSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/EntityHistoryValidatorWithSampleSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.entity;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.common.SampleUtil;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/EntityHistoryValidatorWithSpaceSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/EntityHistoryValidatorWithSpaceSystemTest.java
index cc90be8f3eb..5181bd18fe4 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/EntityHistoryValidatorWithSpaceSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/EntityHistoryValidatorWithSpaceSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.entity;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.CommonAuthorizationSystemTest;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/MatchingEntityValidatorSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/MatchingEntityValidatorSystemTest.java
index 4d86045deb1..9285832c1ac 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/MatchingEntityValidatorSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/MatchingEntityValidatorSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.entity;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/MatchingEntityValidatorWithDataSetSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/MatchingEntityValidatorWithDataSetSystemTest.java
index e4d2e2e7d70..549a1b4ba79 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/MatchingEntityValidatorWithDataSetSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/MatchingEntityValidatorWithDataSetSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.entity;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.CommonValidatorSystemTestAssertions;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/MatchingEntityValidatorWithExperimentSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/MatchingEntityValidatorWithExperimentSystemTest.java
index 07e39d088dc..b0069ef32b4 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/MatchingEntityValidatorWithExperimentSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/MatchingEntityValidatorWithExperimentSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.entity;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/MatchingEntityValidatorWithMaterialSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/MatchingEntityValidatorWithMaterialSystemTest.java
index 3c935d7d2ee..27e921669c6 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/MatchingEntityValidatorWithMaterialSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/MatchingEntityValidatorWithMaterialSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.entity;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.CommonValidatorSystemTestAssertions;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/MatchingEntityValidatorWithSampleSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/MatchingEntityValidatorWithSampleSystemTest.java
index c70be4e45f5..46b64cbc093 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/MatchingEntityValidatorWithSampleSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/entity/MatchingEntityValidatorWithSampleSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.entity;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.CommonValidatorSystemTestAssertions;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/experiment/ExperimentByIdentiferValidatorSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/experiment/ExperimentByIdentiferValidatorSystemTest.java
index 703ca2358cb..cded913a9ce 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/experiment/ExperimentByIdentiferValidatorSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/experiment/ExperimentByIdentiferValidatorSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.experiment;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/experiment/ExperimentValidatorSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/experiment/ExperimentValidatorSystemTest.java
index 830e1970f61..ab5853b0f7c 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/experiment/ExperimentValidatorSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/experiment/ExperimentValidatorSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.experiment;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/project/ProjectByIdentiferValidatorSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/project/ProjectByIdentiferValidatorSystemTest.java
index ca98166f9c7..fc503ededb5 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/project/ProjectByIdentiferValidatorSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/project/ProjectByIdentiferValidatorSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.project;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/project/ProjectValidatorSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/project/ProjectValidatorSystemTest.java
index 5d4ceded83a..40cf661ecab 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/project/ProjectValidatorSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/project/ProjectValidatorSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.project;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/sample/SampleByIdentiferValidatorSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/sample/SampleByIdentiferValidatorSystemTest.java
index 908ab2ee655..e73be54f3ac 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/sample/SampleByIdentiferValidatorSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/sample/SampleByIdentiferValidatorSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.sample;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/sample/SampleValidatorSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/sample/SampleValidatorSystemTest.java
index 2f3f028cd94..1016b390aa3 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/sample/SampleValidatorSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/sample/SampleValidatorSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.sample;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/space/SimpleSpaceOrProjectValidatorSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/space/SimpleSpaceOrProjectValidatorSystemTest.java
index b64ff7b18f9..67b4dc1e526 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/space/SimpleSpaceOrProjectValidatorSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/space/SimpleSpaceOrProjectValidatorSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.space;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.CommonAuthorizationSystemTest;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/space/SimpleSpaceValidatorSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/space/SimpleSpaceValidatorSystemTest.java
index e67e30d2481..5fcbaa777cc 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/space/SimpleSpaceValidatorSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/space/SimpleSpaceValidatorSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.space;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/space/SpaceValidatorSystemTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/space/SpaceValidatorSystemTest.java
index 21ff8093087..fc362bd8bc3 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/space/SpaceValidatorSystemTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/authorization/validator/space/SpaceValidatorSystemTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2017 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.validator.space;
 
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.authorization.ProjectAuthorizationUser;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/DataSetArchiveVerifierTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/DataSetArchiveVerifierTest.java
index b3207d0929c..78a4f369e98 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/DataSetArchiveVerifierTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/archiveverifier/batch/DataSetArchiveVerifierTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.archiveverifier.batch;
 
 import static org.hamcrest.CoreMatchers.is;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/ZipFileIntegrityVerifierTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/ZipFileIntegrityVerifierTest.java
index 94be4e529e6..156e0a3a654 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/ZipFileIntegrityVerifierTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/archiveverifier/verifier/ZipFileIntegrityVerifierTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.archiveverifier.verifier;
 
 import static org.hamcrest.CoreMatchers.is;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/admin/MoveDataSetsCommandTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/admin/MoveDataSetsCommandTest.java
index 9ecd6e48d91..b41083c172b 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/admin/MoveDataSetsCommandTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/admin/MoveDataSetsCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.admin;
 
 import org.jmock.Expectations;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/admin/ShareManagerApplicationTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/admin/ShareManagerApplicationTest.java
index 3b63b5b1253..c16c3f30f72 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/admin/ShareManagerApplicationTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/admin/ShareManagerApplicationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.admin;
 
 import org.jmock.Expectations;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandGetTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandGetTest.java
index 57e441f140e..c75f340e327 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandGetTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandGetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.cli;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandLsTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandLsTest.java
index 0dd2aa800e3..24be92f14fe 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandLsTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandLsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.cli;
 
 import org.jmock.Expectations;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandPutTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandPutTest.java
index c8db37f8686..119d4a2f566 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandPutTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/cli/CommandPutTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.cli;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/cli/DataSetArgumentsTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/cli/DataSetArgumentsTest.java
index 8c853bb68ed..7803ef45eae 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/cli/DataSetArgumentsTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/cli/DataSetArgumentsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.cli;
 
 import org.testng.AssertJUnit;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/cli/DssCommandFactoryTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/cli/DssCommandFactoryTest.java
index 1297b2008ff..9c4bf973a8b 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/cli/DssCommandFactoryTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/cli/DssCommandFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.cli;
 
 import java.io.ByteArrayOutputStream;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/cli/GlobalArgumentsTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/cli/GlobalArgumentsTest.java
index a7d5e256a7d..7506b16f314 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/cli/GlobalArgumentsTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/cli/GlobalArgumentsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.cli;
 
 import org.testng.AssertJUnit;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponentTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponentTest.java
index dafe05ff177..e7dd4c59ed4 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponentTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.v1.impl;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponentTestClient.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponentTestClient.java
index bf6eb2555ca..cd292747a0f 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponentTestClient.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponentTestClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.v1.impl;
 
 import java.util.Properties;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/OpenbisServiceFacadeTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/OpenbisServiceFacadeTest.java
index 7b57d4af4b9..78cbecc7bb9 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/OpenbisServiceFacadeTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/OpenbisServiceFacadeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.client.api.v1.impl;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/AutoResolveUtilsTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/AutoResolveUtilsTest.java
index d0ea377b35d..8808b972511 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/AutoResolveUtilsTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/AutoResolveUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ConfigParametersTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ConfigParametersTest.java
index a3d2415edad..1f240b823b6 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ConfigParametersTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ConfigParametersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServiceTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServiceTest.java
index 370146ec99a..cfdc8327d9c 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServiceTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServiceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DatabaseBasedDataSetPathInfoProviderTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DatabaseBasedDataSetPathInfoProviderTest.java
index 73b740ab0d2..400f7b915f4 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DatabaseBasedDataSetPathInfoProviderTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DatabaseBasedDataSetPathInfoProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.lang.reflect.Method;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServletTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServletTest.java
index 703941680a8..8bf8d51fb76 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServletTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetDownloadServletTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import static ch.systemsx.cisd.common.test.AssertionUtil.assertContains;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DeletionCommandTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DeletionCommandTest.java
index 1e8494882d0..5f8a3bd30d6 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DeletionCommandTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DeletionCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1Test.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1Test.java
index 359aa7125eb..7f2ada72125 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1Test.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.BufferedReader;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISServiceTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISServiceTest.java
index f3c63fa5985..91a152fa126 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISServiceTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISServiceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/FolderFileSizesReportGeneratorTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/FolderFileSizesReportGeneratorTest.java
index f4d6444ab49..10786309731 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/FolderFileSizesReportGeneratorTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/FolderFileSizesReportGeneratorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.IOException;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/IdentifiedStreamHandlingServletTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/IdentifiedStreamHandlingServletTest.java
index bb991ac29c3..29c5c2e1665 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/IdentifiedStreamHandlingServletTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/IdentifiedStreamHandlingServletTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.ByteArrayInputStream;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/KeyBasedDataSetCommandExecutorProviderTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/KeyBasedDataSetCommandExecutorProviderTest.java
index cc669626e5b..907181687f0 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/KeyBasedDataSetCommandExecutorProviderTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/KeyBasedDataSetCommandExecutorProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, SIS
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ProcessDatasetsCommandTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ProcessDatasetsCommandTest.java
index 3968d777623..144265b9f77 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ProcessDatasetsCommandTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ProcessDatasetsCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.IOException;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ShareIdManagerTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ShareIdManagerTest.java
index 10527ed0325..aa78a25fef2 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ShareIdManagerTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ShareIdManagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/StreamRepositoryTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/StreamRepositoryTest.java
index bda6a3b178f..b09435437fb 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/StreamRepositoryTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/StreamRepositoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.ByteArrayInputStream;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/UploadingCommandTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/UploadingCommandTest.java
index ee3997f632f..119114a9888 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/UploadingCommandTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/UploadingCommandTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.ByteArrayOutputStream;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ZipDataSetPackagerTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ZipDataSetPackagerTest.java
index d09d7f9f3d3..417d0843e65 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ZipDataSetPackagerTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ZipDataSetPackagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.io.ByteArrayInputStream;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/DssServiceRpcGenericTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/DssServiceRpcGenericTest.java
index 5ce351308de..5b18a8df1fd 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/DssServiceRpcGenericTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/api/v1/DssServiceRpcGenericTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.api.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/dbbackup/BackupDatabaseDescriptionGeneratorTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/dbbackup/BackupDatabaseDescriptionGeneratorTest.java
index d8b198d97be..124446da97c 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/dbbackup/BackupDatabaseDescriptionGeneratorTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/dbbackup/BackupDatabaseDescriptionGeneratorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.dbbackup;
 
 import ch.systemsx.cisd.dbmigration.DatabaseEngine;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/CacheTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/CacheTest.java
index 74eae952711..8a046986887 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/CacheTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/CacheTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp;
 
 import org.testng.AssertJUnit;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/DSSFileSystemViewTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/DSSFileSystemViewTest.java
index d534fc0257a..4b87b89fc06 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/DSSFileSystemViewTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/DSSFileSystemViewTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp;
 
 import java.io.IOException;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/ResolverConfigBuilder.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/ResolverConfigBuilder.java
index fab9ff464d2..5273bc43f3d 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/ResolverConfigBuilder.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/ResolverConfigBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp;
 
 import java.util.Properties;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/TemplateBasedDataSetResourceResolverTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/TemplateBasedDataSetResourceResolverTest.java
index 48ebd347be9..7fb532c396c 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/TemplateBasedDataSetResourceResolverTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/TemplateBasedDataSetResourceResolverTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.ftp.resolver;
 
 import java.io.ByteArrayInputStream;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/openbisauth/OpenBISAuthenticationInterceptorTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/openbisauth/OpenBISAuthenticationInterceptorTest.java
index 4c24c9f6e10..10be81f487d 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/openbisauth/OpenBISAuthenticationInterceptorTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/openbisauth/OpenBISAuthenticationInterceptorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.openbisauth;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/EmailSenderTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/EmailSenderTest.java
index 4f14cc0e7b2..a98675d660b 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/EmailSenderTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/EmailSenderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython;
 
 import java.io.IOException;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedAggregationServiceReportingPluginTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedAggregationServiceReportingPluginTest.java
index b54e25e7b5b..6ecf3ebe451 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedAggregationServiceReportingPluginTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedAggregationServiceReportingPluginTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedProcessingPluginTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedProcessingPluginTest.java
index 1ec222538cc..1c50deec9c2 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedProcessingPluginTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedProcessingPluginTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedReportingPluginTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedReportingPluginTest.java
index 37d4cccec21..9d000ecd5c5 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedReportingPluginTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/JythonBasedReportingPluginTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/MailServiceTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/MailServiceTest.java
index cde15451f75..a1fd8a0f03e 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/MailServiceTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/MailServiceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractArchiverProcessingPluginTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractArchiverProcessingPluginTest.java
index 025e1404052..488d07d9470 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractArchiverProcessingPluginTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractArchiverProcessingPluginTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractArchiverTestCase.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractArchiverTestCase.java
index da321d6b441..c977441c66e 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractArchiverTestCase.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractArchiverTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractFileTableReportingPluginTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractFileTableReportingPluginTest.java
index ed1f9440f33..50ab48ea420 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractFileTableReportingPluginTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractFileTableReportingPluginTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractPackageArchiverTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractPackageArchiverTest.java
index e03758421d9..ac397821a3c 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractPackageArchiverTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractPackageArchiverTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import static ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.AbstractArchiverProcessingPlugin.SHARE_FINDER_KEY;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ArchivingAggregationServiceTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ArchivingAggregationServiceTest.java
index eead37eac03..abf65f5f07c 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ArchivingAggregationServiceTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ArchivingAggregationServiceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2019 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import static ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.ArchivingAggregationService.GET_ARCHIVING_INFO_METHOD;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetAndPathInfoDBConsistencyCheckProcessingPluginTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetAndPathInfoDBConsistencyCheckProcessingPluginTest.java
index b81f419a2f5..8502cc373d3 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetAndPathInfoDBConsistencyCheckProcessingPluginTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetAndPathInfoDBConsistencyCheckProcessingPluginTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.IOException;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetCopierForUsersTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetCopierForUsersTest.java
index 24c94ab1602..7daa43693f5 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetCopierForUsersTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetCopierForUsersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import static ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.DataSetCopier.DESTINATION_KEY;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetCopierTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetCopierTest.java
index f7d43cf5611..e8c36364a9b 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetCopierTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetCopierTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import static ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.DataSetCopier.DESTINATION_KEY;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetFileOperationsManagerTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetFileOperationsManagerTest.java
index 0502969d13a..70b818109ec 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetFileOperationsManagerTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetFileOperationsManagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ExampleAggregationServicePlugin.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ExampleAggregationServicePlugin.java
index 8a3652fa11d..70312e1e990 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ExampleAggregationServicePlugin.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ExampleAggregationServicePlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ExampleDbModifyingAggregationService.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ExampleDbModifyingAggregationService.java
index f50576a2faa..238b965c89c 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ExampleDbModifyingAggregationService.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ExampleDbModifyingAggregationService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MergedColumnDataReportingPluginTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MergedColumnDataReportingPluginTest.java
index c654a9fa36a..76ae03900ed 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MergedColumnDataReportingPluginTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MergedColumnDataReportingPluginTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MockContent.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MockContent.java
index aa5049d05eb..51c78e6989d 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MockContent.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MockContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.util.HashMap;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MockDataSetDirectoryProvider.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MockDataSetDirectoryProvider.java
index 50a77d00951..7294fd0bda5 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MockDataSetDirectoryProvider.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MockDataSetDirectoryProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MockNode.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MockNode.java
index 4067478947b..13b855bd98f 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MockNode.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/MockNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.ByteArrayInputStream;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/RsyncArchiverTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/RsyncArchiverTest.java
index fadba613e41..0f5ab5d1468 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/RsyncArchiverTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/RsyncArchiverTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import static ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.AbstractArchiverProcessingPlugin.SHARE_FINDER_KEY;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/TSVViewReportingPluginTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/TSVViewReportingPluginTest.java
index f12f668ec4e..7109e59f268 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/TSVViewReportingPluginTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/TSVViewReportingPluginTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import static ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.AbstractFileTableReportingPlugin.IGNORE_COMMENTS_PROPERTY_KEY;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/TarArchiverTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/TarArchiverTest.java
index 9ae1258754e..457225f3ee6 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/TarArchiverTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/TarArchiverTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/TarBasedPathInfoProviderTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/TarBasedPathInfoProviderTest.java
index a4da5d64d8c..31d0baf2ec1 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/TarBasedPathInfoProviderTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/TarBasedPathInfoProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, SIS
+ * Copyright ETH 2015 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ZipArchiverTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ZipArchiverTest.java
index e491703b732..a0aac1bd09d 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ZipArchiverTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ZipArchiverTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/CleanUpUnarchivingScratchShareTaskTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/CleanUpUnarchivingScratchShareTaskTest.java
index 6c6677a5d64..f6578867172 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/CleanUpUnarchivingScratchShareTaskTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/CleanUpUnarchivingScratchShareTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 ETH Zuerich, SIS
+ * Copyright ETH 2022 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/FileDeleterTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/FileDeleterTest.java
index 0c274e86359..d51d6a36f84 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/FileDeleterTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/FileDeleterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, SIS
+ * Copyright ETH 2015 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MockCleaner.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MockCleaner.java
index a7bbf3cffbe..8db0ae223b3 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MockCleaner.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MockCleaner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, SIS
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MockMultiDataSetArchiverDBTransaction.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MockMultiDataSetArchiverDBTransaction.java
index f9f533b11ed..116c6c730b7 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MockMultiDataSetArchiverDBTransaction.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MockMultiDataSetArchiverDBTransaction.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2022 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
 
 import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.dataaccess.IMultiDataSetArchiverDBTransaction;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiveCleanerTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiveCleanerTest.java
index 3e28ff1ede7..2a757470a93 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiveCleanerTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiveCleanerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, SIS
+ * Copyright ETH 2015 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiverTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiverTest.java
index 1fb5321acc0..c3a26af2729 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiverTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiverTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, SIS
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
 
 import static ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.MultiDataSetArchiver.MAXIMUM_CONTAINER_SIZE_IN_BYTES;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchivingFinalizerTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchivingFinalizerTest.java
index 1781d3e4e33..8a38fb8078f 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchivingFinalizerTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchivingFinalizerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, SIS
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetDeletionMaintenanceTaskTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetDeletionMaintenanceTaskTest.java
index 5b2da26eb8d..ff41f6f34c3 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetDeletionMaintenanceTaskTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetDeletionMaintenanceTaskTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2022 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.IApplicationServerApi;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetUnarchivingMaintenanceTaskTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetUnarchivingMaintenanceTaskTest.java
index b6779bc184d..96f4b61d350 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetUnarchivingMaintenanceTaskTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetUnarchivingMaintenanceTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, SIS
+ * Copyright ETH 2015 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/TimeProviderWithMessageChannelInteraction.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/TimeProviderWithMessageChannelInteraction.java
index 486028c2aff..5282d3691ec 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/TimeProviderWithMessageChannelInteraction.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/TimeProviderWithMessageChannelInteraction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, SIS
+ * Copyright ETH 2015 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
 
 import ch.systemsx.cisd.common.concurrent.MessageChannel;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/IterativeTableModelBuilderTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/IterativeTableModelBuilderTest.java
index 3eb047a2880..1dfc03043c4 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/IterativeTableModelBuilderTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/IterativeTableModelBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/PluginTaskParametersTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/PluginTaskParametersTest.java
index fe31bd17c4d..71f4fbcbeb1 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/PluginTaskParametersTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/PluginTaskParametersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/AbstractIShareFinderTestCase.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/AbstractIShareFinderTestCase.java
index 396451cbc62..9d67107cfb1 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/AbstractIShareFinderTestCase.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/AbstractIShareFinderTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/AbstractShareFinderTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/AbstractShareFinderTest.java
index 59fcb46a6dc..759567afbbf 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/AbstractShareFinderTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/AbstractShareFinderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSetTypeBasedShareFinderTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSetTypeBasedShareFinderTest.java
index 1062a5501b5..5dd707f5c08 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSetTypeBasedShareFinderTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/DataSetTypeBasedShareFinderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/ExperimentBasedShareFinderTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/ExperimentBasedShareFinderTest.java
index a9a8e222635..17a449f5aa1 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/ExperimentBasedShareFinderTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/ExperimentBasedShareFinderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/HierarchicalContentProviderTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/HierarchicalContentProviderTest.java
index a5682dba2b7..511643e8dfe 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/HierarchicalContentProviderTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/HierarchicalContentProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedOpenBISServiceTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedOpenBISServiceTest.java
index 1373d2e757e..2ec7e7e7c0a 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedOpenBISServiceTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedOpenBISServiceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.lang.reflect.Method;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/IdentifierAttributeMappingManagerTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/IdentifierAttributeMappingManagerTest.java
index ee6561a5ecb..a5657dc036a 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/IdentifierAttributeMappingManagerTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/IdentifierAttributeMappingManagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/IncomingShareIdProviderTestWrapper.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/IncomingShareIdProviderTestWrapper.java
index cc345dd445b..7b3d1d0a6ce 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/IncomingShareIdProviderTestWrapper.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/IncomingShareIdProviderTestWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.Collection;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/MappingBasedShareFinderTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/MappingBasedShareFinderTest.java
index 35682c3bd70..2fa067bbad8 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/MappingBasedShareFinderTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/MappingBasedShareFinderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/ProxyShareIdManager.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/ProxyShareIdManager.java
index 6a8e51a3c16..fbc6cdf5ec4 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/ProxyShareIdManager.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/ProxyShareIdManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.List;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/ServiceProviderTestWrapper.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/ServiceProviderTestWrapper.java
index 1cae1d27b40..85529ae38eb 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/ServiceProviderTestWrapper.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/ServiceProviderTestWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.HashMap;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/SimpleShareFinderTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/SimpleShareFinderTest.java
index a41e34854c1..c36da555a9b 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/SimpleShareFinderTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/SimpleShareFinderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.ArrayList;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/SpeedOptimizedShareFinderTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/SpeedOptimizedShareFinderTest.java
index b3fa3781ce7..da01bc8194f 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/SpeedOptimizedShareFinderTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/SpeedOptimizedShareFinderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.lang.reflect.Method;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/StandardShareFinderTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/StandardShareFinderTest.java
index f4cc352c514..a2013a83c09 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/StandardShareFinderTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/StandardShareFinderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared;
 
 import java.util.Arrays;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/DataSetFileDTOTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/DataSetFileDTOTest.java
index 062bea01516..98f4d5228b1 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/DataSetFileDTOTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/DataSetFileDTOTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.v1;
 
 import org.testng.AssertJUnit;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/FileInfoDssBuilderTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/FileInfoDssBuilderTest.java
index 1c2cf2e094a..a40a0eb69d7 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/FileInfoDssBuilderTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/FileInfoDssBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.v1;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/FileInfoDssDTOTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/FileInfoDssDTOTest.java
index 0e37ee1bed5..73ab6c4a943 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/FileInfoDssDTOTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/FileInfoDssDTOTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.v1;
 
 import org.testng.AssertJUnit;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/validation/ValidationScriptRunnerTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/validation/ValidationScriptRunnerTest.java
index cd094ca1152..15b0e41d702 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/validation/ValidationScriptRunnerTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/validation/ValidationScriptRunnerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.api.v1.validation;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/AbstractRemoteHierarchicalContentTestCase.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/AbstractRemoteHierarchicalContentTestCase.java
index a353c930cf8..d5297ac1417 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/AbstractRemoteHierarchicalContentTestCase.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/AbstractRemoteHierarchicalContentTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.content;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/ContentCacheTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/ContentCacheTest.java
index bae3257cbbc..c953e746d8f 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/ContentCacheTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/ContentCacheTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.content;
 
 import static ch.systemsx.cisd.openbis.dss.generic.shared.content.ContentCache.CACHE_FOLDER;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/DelayedPersistenceManagerTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/DelayedPersistenceManagerTest.java
index ee3601c15d2..ff753bd60c5 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/DelayedPersistenceManagerTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/DelayedPersistenceManagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.content;
 
 import org.jmock.Expectations;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/PathInfoProviderBasedHierarchicalContentTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/PathInfoProviderBasedHierarchicalContentTest.java
index 753ed44533c..226649057bf 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/PathInfoProviderBasedHierarchicalContentTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/PathInfoProviderBasedHierarchicalContentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.content;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/RemoteHierarchicalContentNodeMultiThreadTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/RemoteHierarchicalContentNodeMultiThreadTest.java
index fc8ddec2736..5ddcf581915 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/RemoteHierarchicalContentNodeMultiThreadTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/RemoteHierarchicalContentNodeMultiThreadTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.content;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/RemoteHierarchicalContentNodeTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/RemoteHierarchicalContentNodeTest.java
index ae202b144a2..c25bd17a3c4 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/RemoteHierarchicalContentNodeTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/RemoteHierarchicalContentNodeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.content;
 
 import static ch.systemsx.cisd.common.utilities.SystemTimeProvider.SYSTEM_TIME_PROVIDER;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/RemoteHierarchicalContentTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/RemoteHierarchicalContentTest.java
index ee43ea7d85c..d38759f0a26 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/RemoteHierarchicalContentTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/RemoteHierarchicalContentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.content;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/PathInfoTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/PathInfoTest.java
index 68c3beabb53..a443eaea2b0 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/PathInfoTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/PathInfoTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.dto;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CodeAndLabelTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CodeAndLabelTest.java
index 4f221f62879..05ddf599b78 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CodeAndLabelTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CodeAndLabelTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import org.testng.AssertJUnit;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ImageUtilReaderPoolTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ImageUtilReaderPoolTest.java
index 1dfb5291705..3ae36f0bfea 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ImageUtilReaderPoolTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ImageUtilReaderPoolTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2015 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import org.jmock.Expectations;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ImageUtilTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ImageUtilTest.java
index 2130e2b5b11..b73ee5bec38 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ImageUtilTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ImageUtilTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.awt.Color;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/MockFreeSpaceProvider.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/MockFreeSpaceProvider.java
index b17e77469e0..5025a7d520c 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/MockFreeSpaceProvider.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/MockFreeSpaceProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.io.IOException;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/PluginUtilTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/PluginUtilTest.java
index eef6d9efdc5..5de207ff7d7 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/PluginUtilTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/PluginUtilTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/PostgresPlusFileSystemFreeSpaceProviderTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/PostgresPlusFileSystemFreeSpaceProviderTest.java
index 04c990b2a8b..fd78cbebac3 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/PostgresPlusFileSystemFreeSpaceProviderTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/PostgresPlusFileSystemFreeSpaceProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import static ch.systemsx.cisd.openbis.dss.generic.shared.utils.PostgresPlusFileSystemFreeSpaceProvider.DATA_SOURCE_KEY;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtilsTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtilsTest.java
index 728d32404ce..34dde2da743 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtilsTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetArchivingStatus.ARCHIVED;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ShareFactoryTest.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ShareFactoryTest.java
index cde1ef4e06a..a669dc21020 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ShareFactoryTest.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ShareFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SimpleFileContentProvider.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SimpleFileContentProvider.java
index a1020e43c3b..476f36e9385 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SimpleFileContentProvider.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SimpleFileContentProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, SIS
+ * Copyright ETH 2014 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.io.File;
diff --git a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ThumbnailTiming.java b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ThumbnailTiming.java
index 1206c96e505..e75615fc1f5 100644
--- a/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ThumbnailTiming.java
+++ b/server-original-data-store/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ThumbnailTiming.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
 
 import java.awt.image.BufferedImage;
-- 
GitLab