From e099e1f572994adeddecf7275f37cf70a4b45098 Mon Sep 17 00:00:00 2001
From: alaskowski <alaskowski@ethz.ch>
Date: Thu, 16 Feb 2023 15:33:53 +0100
Subject: [PATCH] SSDM-13365: Updated copyright comments in
 server-application-server

---
 .../generic/server/FileServiceServlet.java    |  3 +-
 .../generic/server/SingleSignOnServlet.java   |  3 +-
 .../server/asapi/v3/ApplicationServerApi.java |  3 +-
 .../v3/ApplicationServerApiJsonServer.java    |  3 +-
 .../asapi/v3/ApplicationServerApiLogger.java  |  3 +-
 ...iPersonalAccessTokenInvocationHandler.java | 15 ++++
 .../asapi/v3/ApplicationServerApiServer.java  |  3 +-
 .../v3/IApplicationServerInternalApi.java     |  3 +-
 .../asapi/v3/cache/FetchOptionsMatcher.java   |  3 +-
 .../server/asapi/v3/cache/ISearchCache.java   |  3 +-
 .../server/asapi/v3/cache/SearchCache.java    |  3 +-
 .../v3/cache/SearchCacheCleanupListener.java  |  3 +-
 .../asapi/v3/cache/SearchCacheEntry.java      |  3 +-
 .../server/asapi/v3/cache/SearchCacheKey.java |  3 +-
 .../server/asapi/v3/context/Context.java      |  3 +-
 .../server/asapi/v3/context/IContext.java     |  3 +-
 .../server/asapi/v3/context/IProgress.java    |  3 +-
 .../asapi/v3/context/IProgressListener.java   |  3 +-
 .../asapi/v3/context/IProgressStack.java      |  3 +-
 .../server/asapi/v3/context/Progress.java     |  3 +-
 .../asapi/v3/context/ProgressDetails.java     |  3 +-
 .../ProgressDetailsFilterProvider.java        | 15 ++++
 .../ProgressDetailsToStringBuilder.java       |  3 +-
 .../asapi/v3/context/ProgressFormatter.java   |  3 +-
 .../asapi/v3/context/ProgressStack.java       |  3 +-
 .../asapi/v3/executor/IOperationContext.java  |  3 +-
 .../asapi/v3/executor/OperationContext.java   |  3 +-
 .../attachment/CreateAttachmentExecutor.java  |  3 +-
 .../attachment/DeleteAttachmentExecutor.java  |  3 +-
 ...ractUpdateAttachmentForEntityExecutor.java |  3 +-
 .../attachment/ICreateAttachmentExecutor.java |  3 +-
 .../attachment/IDeleteAttachmentExecutor.java |  3 +-
 .../IUpdateAttachmentForEntityExecutor.java   |  3 +-
 .../UpdateAttachmentForEntityExecutor.java    |  3 +-
 ...thorizationGroupAuthorizationExecutor.java |  3 +-
 .../CreateAuthorizationGroupExecutor.java     |  3 +-
 ...eAuthorizationGroupsOperationExecutor.java |  3 +-
 .../DeleteAuthorizationGroupExecutor.java     |  3 +-
 ...eAuthorizationGroupsOperationExecutor.java |  3 +-
 ...tAuthorizationGroupsOperationExecutor.java |  3 +-
 ...thorizationGroupAuthorizationExecutor.java |  3 +-
 .../IAuthorizationGroupTranslator.java        |  3 +-
 .../ICreateAuthorizationGroupExecutor.java    |  3 +-
 ...eAuthorizationGroupsOperationExecutor.java |  3 +-
 .../IDeleteAuthorizationGroupExecutor.java    |  3 +-
 ...eAuthorizationGroupsOperationExecutor.java |  3 +-
 ...tAuthorizationGroupsOperationExecutor.java |  3 +-
 .../IMapGroupPEByIdExecutor.java              |  3 +-
 .../IMapGroupTechIdByIdExecutor.java          |  3 +-
 .../ISearchAuthorizationGroupExecutor.java    |  3 +-
 ...hAuthorizationGroupsOperationExecutor.java |  3 +-
 .../ISetAuthorizationGroupUsersExecutor.java  |  3 +-
 .../IUpdateAuthorizationGroupExecutor.java    |  3 +-
 ...UpdateAuthorizationGroupUsersExecutor.java |  3 +-
 ...horizationGroupUsersWithCacheExecutor.java |  3 +-
 ...eAuthorizationGroupsOperationExecutor.java |  3 +-
 .../MapGroupPEByIdExecutor.java               |  3 +-
 .../MapGroupTechIdByIdExecutor.java           |  3 +-
 .../SearchAuthorizationGroupExecutor.java     |  3 +-
 ...hAuthorizationGroupsOperationExecutor.java |  3 +-
 .../SetAuthorizationGroupUsersExecutor.java   |  3 +-
 .../UpdateAuthorizationGroupExecutor.java     |  3 +-
 ...UpdateAuthorizationGroupUsersExecutor.java |  3 +-
 ...horizationGroupUsersWithCacheExecutor.java |  3 +-
 ...eAuthorizationGroupsOperationExecutor.java |  3 +-
 .../v3/executor/common/EventExecutor.java     |  3 +-
 .../v3/executor/common/IEventExecutor.java    |  3 +-
 .../common/IObjectAuthorizationExecutor.java  |  3 +-
 .../executor/common/IOperationExecutor.java   |  3 +-
 .../v3/executor/common/OperationExecutor.java |  3 +-
 .../CreateObjectsOperationExecutor.java       |  3 +-
 .../ICreateObjectsOperationExecutor.java      |  3 +-
 .../DeleteObjectsOperationExecutor.java       |  3 +-
 .../IDeleteObjectsOperationExecutor.java      |  3 +-
 .../AbstractGetObjectsOperationExecutor.java  |  3 +-
 .../get/AbstractMapObjectByIdExecutor.java    |  3 +-
 .../get/GetObjectsOperationExecutor.java      |  3 +-
 .../get/GetObjectsPEOperationExecutor.java    |  3 +-
 ...GetServerInformationOperationExecutor.java |  3 +-
 ...verPublicInformationOperationExecutor.java |  3 +-
 ...GetServerInformationOperationExecutor.java |  3 +-
 ...verPublicInformationOperationExecutor.java |  3 +-
 .../common/get/IMapObjectByIdExecutor.java    |  3 +-
 .../common/search/AbstractIdMatcher.java      |  3 +-
 .../common/search/AbstractIdsMatcher.java     |  3 +-
 .../search/AbstractSearchObjectExecutor.java  |  3 +-
 .../AbstractSearchObjectManuallyExecutor.java |  3 +-
 ...bstractSearchObjectsOperationExecutor.java |  3 +-
 .../common/search/CacheOptionsVO.java         | 15 ++++
 .../executor/common/search/CodeMatcher.java   |  3 +-
 .../executor/common/search/CodesMatcher.java  |  3 +-
 .../common/search/ISearchObjectExecutor.java  |  3 +-
 .../ISearchObjectsOperationExecutor.java      |  3 +-
 .../v3/executor/common/search/Matcher.java    |  3 +-
 .../executor/common/search/NameMatcher.java   |  3 +-
 .../SearchObjectsOperationExecutor.java       |  3 +-
 .../SearchObjectsPEOperationExecutor.java     |  3 +-
 .../common/search/SimpleFieldMatcher.java     |  3 +-
 .../common/search/StringFieldMatcher.java     |  3 +-
 .../common/search/cache/CacheManager.java     | 15 ++++
 .../common/search/cache/FileCache.java        | 15 ++++
 .../executor/common/search/cache/ICache.java  | 15 ++++
 .../common/search/cache/ICacheManager.java    | 15 ++++
 .../common/search/cache/ITestableCache.java   | 15 ++++
 .../common/search/cache/MemoryCache.java      | 15 ++++
 .../AssertionOfNoDeletedEntityExecutor.java   |  3 +-
 .../common/update/DeletedEntityRecord.java    |  3 +-
 .../IAssertionOfNoDeletedEntityExecutor.java  |  3 +-
 .../common/update/IDeletedEntityQuery.java    |  3 +-
 .../IUpdateObjectsOperationExecutor.java      |  3 +-
 ...pdateFieldWithListUpdateValueExecutor.java |  3 +-
 .../UpdateObjectsOperationExecutor.java       |  3 +-
 .../IVerifyObjectsOperationExecutor.java      |  3 +-
 .../VerifyObjectsOperationExecutor.java       |  3 +-
 ...stractArchiveUnarchiveDataSetExecutor.java |  3 +-
 .../AbstractVerifyDataSetCyclesExecutor.java  |  3 +-
 .../AddContentCopiesToLinkedDataExecutor.java | 15 ++++
 .../dataset/ArchiveDataSetExecutor.java       |  3 +-
 .../ArchiveDataSetsOperationExecutor.java     |  3 +-
 .../dataset/CreateDataSetExecutor.java        |  3 +-
 .../dataset/CreateDataSetTypesExecutor.java   |  3 +-
 .../CreateDataSetTypesOperationExecutor.java  |  3 +-
 .../CreateDataSetsOperationExecutor.java      |  3 +-
 .../dataset/DataSetAuthorizationExecutor.java |  3 +-
 .../DataSetTypeAuthorizationExecutor.java     |  3 +-
 .../dataset/DeleteDataSetExecutor.java        |  3 +-
 .../DeleteDataSetTypesOperationExecutor.java  |  3 +-
 .../DeleteDataSetsOperationExecutor.java      |  3 +-
 .../FileFormatTypeAuthorizationExecutor.java  |  3 +-
 .../GetDataSetTypesOperationExecutor.java     |  3 +-
 .../dataset/GetDataSetsOperationExecutor.java |  3 +-
 ...IAddContentCopiesToLinkedDataExecutor.java | 15 ++++
 .../dataset/IArchiveDataSetExecutor.java      |  3 +-
 .../IArchiveDataSetsOperationExecutor.java    |  3 +-
 .../dataset/ICreateDataSetExecutor.java       |  3 +-
 .../dataset/ICreateDataSetTypeExecutor.java   |  3 +-
 .../ICreateDataSetTypesOperationExecutor.java |  3 +-
 .../ICreateDataSetsOperationExecutor.java     |  3 +-
 .../IDataSetAuthorizationExecutor.java        |  3 +-
 .../IDataSetTypeAuthorizationExecutor.java    |  3 +-
 .../dataset/IDeleteDataSetExecutor.java       |  3 +-
 .../IDeleteDataSetTypesOperationExecutor.java |  3 +-
 .../IDeleteDataSetsOperationExecutor.java     |  3 +-
 .../IFileFormatTypeAuthorizationExecutor.java |  3 +-
 .../IGetDataSetTypesOperationExecutor.java    |  3 +-
 .../IGetDataSetsOperationExecutor.java        |  3 +-
 .../ILocatorTypeAuthorizationExecutor.java    |  3 +-
 .../dataset/ILockDataSetExecutor.java         |  3 +-
 .../ILockDataSetsOperationExecutor.java       |  3 +-
 .../dataset/IMapDataSetByIdExecutor.java      |  3 +-
 .../IMapDataSetTechIdByIdExecutor.java        |  3 +-
 .../IMapFileFormatTypeByIdExecutor.java       |  3 +-
 .../dataset/IMapLocatorTypeByIdExecutor.java  |  3 +-
 .../IMapStorageFormatByIdExecutor.java        |  3 +-
 .../dataset/ISearchDataSetExecutor.java       |  3 +-
 .../dataset/ISearchDataSetTypeExecutor.java   |  3 +-
 .../ISearchDataSetTypesOperationExecutor.java |  3 +-
 .../ISearchDataSetsOperationExecutor.java     |  3 +-
 .../dataset/ISetDataSetChildrenExecutor.java  |  3 +-
 .../ISetDataSetComponentsExecutor.java        |  3 +-
 .../dataset/ISetDataSetContainerExecutor.java |  3 +-
 .../dataset/ISetDataSetDataStoreExecutor.java |  3 +-
 .../ISetDataSetExperimentExecutor.java        |  3 +-
 .../ISetDataSetExternalDmsExecutor.java       |  3 +-
 .../ISetDataSetFileFormatTypeExecutor.java    |  3 +-
 .../ISetDataSetLinkedDataExecutor.java        |  3 +-
 .../ISetDataSetLocatorTypeExecutor.java       |  3 +-
 .../dataset/ISetDataSetParentsExecutor.java   |  3 +-
 .../ISetDataSetPhysicalDataExecutor.java      |  3 +-
 .../ISetDataSetRelatedDataSetsExecutor.java   |  3 +-
 .../dataset/ISetDataSetSampleExecutor.java    |  3 +-
 .../ISetDataSetStorageFormatExecutor.java     |  3 +-
 .../IStorageFormatAuthorizationExecutor.java  |  3 +-
 .../dataset/IUnarchiveDataSetExecutor.java    |  3 +-
 .../IUnarchiveDataSetsOperationExecutor.java  |  3 +-
 .../dataset/IUnlockDataSetExecutor.java       |  3 +-
 .../IUnlockDataSetsOperationExecutor.java     |  3 +-
 .../IUpdateDataSetChildrenExecutor.java       |  3 +-
 .../IUpdateDataSetComponentsExecutor.java     |  3 +-
 .../IUpdateDataSetContainersExecutor.java     |  3 +-
 .../dataset/IUpdateDataSetExecutor.java       |  3 +-
 .../IUpdateDataSetExperimentExecutor.java     |  3 +-
 .../IUpdateDataSetExternalDmsExecutor.java    |  3 +-
 .../IUpdateDataSetFileFormatTypeExecutor.java |  3 +-
 .../IUpdateDataSetLinkedDataExecutor.java     |  3 +-
 .../IUpdateDataSetParentsExecutor.java        |  3 +-
 .../IUpdateDataSetPhysicalDataExecutor.java   |  3 +-
 .../IUpdateDataSetPropertyExecutor.java       |  3 +-
 ...IUpdateDataSetRelatedDataSetsExecutor.java |  3 +-
 .../dataset/IUpdateDataSetSampleExecutor.java |  3 +-
 .../dataset/IUpdateDataSetTypeExecutor.java   |  3 +-
 ...pdateDataSetTypePropertyTypesExecutor.java |  3 +-
 .../IUpdateDataSetTypesOperationExecutor.java |  3 +-
 .../IUpdateDataSetsOperationExecutor.java     |  3 +-
 .../IVerifyDataSetContainersExecutor.java     |  3 +-
 .../IVerifyDataSetContentCopyExecutor.java    | 15 ++++
 .../dataset/IVerifyDataSetExecutor.java       |  3 +-
 .../IVerifyDataSetParentsExecutor.java        |  3 +-
 ...ifyDataSetSampleAndExperimentExecutor.java |  3 +-
 .../IVerifyDataSetsOperationExecutor.java     |  3 +-
 .../LocatorTypeAuthorizationExecutor.java     |  3 +-
 .../executor/dataset/LockDataSetExecutor.java |  3 +-
 .../LockDataSetsOperationExecutor.java        |  3 +-
 .../dataset/MapDataSetByIdExecutor.java       |  3 +-
 .../dataset/MapDataSetTechIdByIdExecutor.java |  3 +-
 .../MapFileFormatTypeByIdExecutor.java        |  3 +-
 .../dataset/MapLocatorTypeByIdExecutor.java   |  3 +-
 .../dataset/MapStorageFormatByIdExecutor.java |  3 +-
 .../dataset/SearchDataSetExecutor.java        |  3 +-
 .../dataset/SearchDataSetTypeExecutor.java    |  3 +-
 .../SearchDataSetTypesOperationExecutor.java  |  3 +-
 .../SearchDataSetsOperationExecutor.java      |  3 +-
 .../dataset/SetDataSetChildrenExecutor.java   |  3 +-
 .../dataset/SetDataSetComponentsExecutor.java |  3 +-
 .../dataset/SetDataSetContainerExecutor.java  |  3 +-
 .../dataset/SetDataSetDataStoreExecutor.java  |  3 +-
 .../dataset/SetDataSetExperimentExecutor.java |  3 +-
 .../SetDataSetExternalDmsExecutor.java        |  3 +-
 .../SetDataSetFileFormatTypeExecutor.java     |  3 +-
 .../dataset/SetDataSetLinkedDataExecutor.java |  3 +-
 .../SetDataSetLocatorTypeExecutor.java        |  3 +-
 .../dataset/SetDataSetParentsExecutor.java    |  3 +-
 .../SetDataSetPhysicalDataExecutor.java       |  3 +-
 .../dataset/SetDataSetSampleExecutor.java     |  3 +-
 .../SetDataSetStorageFormatExecutor.java      |  3 +-
 .../SetDataSetToDataSetsRelationExecutor.java |  3 +-
 .../StorageFormatAuthorizationExecutor.java   |  3 +-
 .../dataset/UnarchiveDataSetExecutor.java     |  3 +-
 .../UnarchiveDataSetsOperationExecutor.java   |  3 +-
 .../dataset/UnlockDataSetExecutor.java        |  3 +-
 .../UnlockDataSetsOperationExecutor.java      |  3 +-
 .../UpdateDataSetChildrenExecutor.java        |  3 +-
 .../UpdateDataSetComponentsExecutor.java      |  3 +-
 .../UpdateDataSetContainersExecutor.java      |  3 +-
 .../dataset/UpdateDataSetExecutor.java        |  3 +-
 .../UpdateDataSetExperimentExecutor.java      |  3 +-
 .../UpdateDataSetExternalDmsExecutor.java     |  3 +-
 .../UpdateDataSetFileFormatTypeExecutor.java  |  3 +-
 .../UpdateDataSetLinkedDataExecutor.java      |  3 +-
 .../dataset/UpdateDataSetParentsExecutor.java |  3 +-
 .../UpdateDataSetPhysicalDataExecutor.java    |  3 +-
 .../UpdateDataSetPropertyExecutor.java        |  3 +-
 .../UpdateDataSetRelatedDataSetsExecutor.java |  3 +-
 .../dataset/UpdateDataSetSampleExecutor.java  |  3 +-
 .../dataset/UpdateDataSetTypeExecutor.java    |  3 +-
 ...pdateDataSetTypePropertyTypesExecutor.java |  3 +-
 .../UpdateDataSetTypesOperationExecutor.java  |  3 +-
 .../UpdateDataSetsOperationExecutor.java      |  3 +-
 .../VerifyDataSetContainersExecutor.java      |  3 +-
 .../VerifyDataSetContentCopyExecutor.java     | 15 ++++
 .../dataset/VerifyDataSetExecutor.java        |  3 +-
 .../dataset/VerifyDataSetParentsExecutor.java |  3 +-
 ...ifyDataSetSampleAndExperimentExecutor.java |  3 +-
 .../VerifyDataSetsOperationExecutor.java      |  3 +-
 .../DataStoreAuthorizationExecutor.java       |  3 +-
 .../IDataStoreAuthorizationExecutor.java      |  3 +-
 .../datastore/IMapDataStoreByIdExecutor.java  |  3 +-
 .../datastore/ISearchDataStoreExecutor.java   |  3 +-
 .../ISearchDataStoresOperationExecutor.java   |  3 +-
 .../datastore/MapDataStoreByIdExecutor.java   |  3 +-
 .../datastore/SearchDataStoreExecutor.java    |  3 +-
 .../SearchDataStoresOperationExecutor.java    |  3 +-
 .../deletion/ConfirmDeletionExecutor.java     |  3 +-
 .../ConfirmDeletionsOperationExecutor.java    |  3 +-
 .../DeletionAuthorizationExecutor.java        |  3 +-
 .../deletion/IConfirmDeletionExecutor.java    |  3 +-
 .../IConfirmDeletionsOperationExecutor.java   |  3 +-
 .../IDeletionAuthorizationExecutor.java       |  3 +-
 .../deletion/IMapDeletionByIdExecutor.java    |  3 +-
 .../deletion/IRevertDeletionExecutor.java     |  3 +-
 .../IRevertDeletionsOperationExecutor.java    |  3 +-
 .../deletion/ISearchDeletionExecutor.java     |  3 +-
 .../ISearchDeletionsOperationExecutor.java    |  3 +-
 .../deletion/MapDeletionByIdExecutor.java     |  3 +-
 .../deletion/RevertDeletionExecutor.java      |  3 +-
 .../RevertDeletionsOperationExecutor.java     |  3 +-
 .../deletion/SearchDeletionExecutor.java      |  3 +-
 .../SearchDeletionsOperationExecutor.java     |  3 +-
 .../entity/AbstractCreateEntityExecutor.java  |  3 +-
 .../AbstractCreateEntityTypeExecutor.java     |  3 +-
 .../entity/AbstractDeleteEntityExecutor.java  |  3 +-
 ...stractGetEntityTypesOperationExecutor.java |  3 +-
 .../AbstractSearchEntityTypeExecutor.java     |  3 +-
 ...ctSetEntityExperimentRelationExecutor.java |  3 +-
 ...stractSetEntitySampleRelationExecutor.java |  3 +-
 ...stractSetEntityToManyRelationExecutor.java |  3 +-
 ...bstractSetEntityToOneRelationExecutor.java |  3 +-
 .../entity/AbstractUpdateEntityExecutor.java  |  3 +-
 ...UpdateEntityMultipleRelationsExecutor.java |  3 +-
 ...actUpdateEntityToManyRelationExecutor.java |  3 +-
 ...ractUpdateEntityToOneRelationExecutor.java |  3 +-
 .../AbstractUpdateEntityTypeExecutor.java     |  3 +-
 ...UpdateEntityTypePropertyTypesExecutor.java |  3 +-
 .../AbstractVerifyEntityCyclesExecutor.java   |  3 +-
 .../entity/CreateCodesOperationExecutor.java  |  3 +-
 .../CreatePermIdsOperationExecutor.java       |  3 +-
 .../CreatePropertyAssignmentsExecutor.java    |  3 +-
 .../entity/DeleteEntityTypeExecutor.java      |  3 +-
 .../entity/EntityAuthorizationExecutor.java   |  3 +-
 .../entity/ICreateCodesOperationExecutor.java |  3 +-
 .../entity/ICreateEntityExecutor.java         |  3 +-
 .../ICreatePermIdsOperationExecutor.java      |  3 +-
 .../entity/IDeleteEntityExecutor.java         |  3 +-
 .../entity/IDeleteEntityTypeExecutor.java     |  3 +-
 .../entity/IEntityAuthorizationExecutor.java  |  3 +-
 .../entity/IMapEntityTypeByIdExecutor.java    |  3 +-
 .../v3/executor/entity/IPluginIdProvider.java |  3 +-
 .../entity/IReindexEntityExecutor.java        |  3 +-
 .../entity/ISearchEntityTypeExecutor.java     |  3 +-
 .../entity/ISetEntityRelationsExecutor.java   |  3 +-
 .../entity/IUpdateEntityExecutor.java         |  3 +-
 .../IUpdateEntityRelationsExecutor.java       |  3 +-
 ...pdateEntityRelationsWithCacheExecutor.java |  3 +-
 ...UpdateEntityTypePropertyTypesExecutor.java |  3 +-
 .../IVerifyEntityRelationsExecutor.java       |  3 +-
 .../entity/MapEntityTypeByIdExecutor.java     |  3 +-
 .../entity/ReindexEntityExecutor.java         |  3 +-
 .../entity/SearchEntityTypeExecutor.java      |  3 +-
 ...SetEntityTypeValidationScriptExecutor.java |  3 +-
 .../event/EventAuthorizationExecutor.java     |  3 +-
 .../event/IEventAuthorizationExecutor.java    |  3 +-
 .../executor/event/ISearchEventExecutor.java  |  3 +-
 .../event/ISearchEventsOperationExecutor.java |  3 +-
 .../executor/event/SearchEventExecutor.java   |  3 +-
 .../event/SearchEventsOperationExecutor.java  |  3 +-
 .../experiment/CreateExperimentExecutor.java  |  3 +-
 .../CreateExperimentTypesExecutor.java        |  3 +-
 ...reateExperimentTypesOperationExecutor.java |  3 +-
 .../CreateExperimentsOperationExecutor.java   |  3 +-
 .../experiment/DeleteExperimentExecutor.java  |  3 +-
 ...eleteExperimentTypesOperationExecutor.java |  3 +-
 .../DeleteExperimentsOperationExecutor.java   |  3 +-
 .../ExperimentAuthorizationExecutor.java      |  3 +-
 .../ExperimentTypeAuthorizationExecutor.java  |  3 +-
 .../GetExperimentTypesOperationExecutor.java  |  3 +-
 .../GetExperimentsOperationExecutor.java      |  3 +-
 .../experiment/ICreateExperimentExecutor.java |  3 +-
 .../ICreateExperimentTypeExecutor.java        |  3 +-
 ...reateExperimentTypesOperationExecutor.java |  3 +-
 .../ICreateExperimentsOperationExecutor.java  |  3 +-
 .../experiment/IDeleteExperimentExecutor.java |  3 +-
 ...eleteExperimentTypesOperationExecutor.java |  3 +-
 .../IDeleteExperimentsOperationExecutor.java  |  3 +-
 .../IExperimentAuthorizationExecutor.java     |  3 +-
 .../IExperimentTypeAuthorizationExecutor.java |  3 +-
 .../IGetExperimentTypesOperationExecutor.java |  3 +-
 .../IGetExperimentsOperationExecutor.java     |  3 +-
 .../IMapExperimentByIdExecutor.java           |  3 +-
 .../experiment/ISearchExperimentExecutor.java |  3 +-
 .../ISearchExperimentTypeExecutor.java        |  3 +-
 ...earchExperimentTypesOperationExecutor.java |  3 +-
 .../ISearchExperimentsOperationExecutor.java  |  3 +-
 .../ISetExperimentProjectExecutor.java        |  3 +-
 .../ISetExperimentTypeExecutor.java           |  3 +-
 .../IUpdateExperimentAttachmentExecutor.java  |  3 +-
 .../experiment/IUpdateExperimentExecutor.java |  3 +-
 .../IUpdateExperimentProjectExecutor.java     |  3 +-
 .../IUpdateExperimentPropertyExecutor.java    |  3 +-
 .../IUpdateExperimentTypeExecutor.java        |  3 +-
 ...teExperimentTypePropertyTypesExecutor.java |  3 +-
 ...pdateExperimentTypesOperationExecutor.java |  3 +-
 .../IUpdateExperimentsOperationExecutor.java  |  3 +-
 .../experiment/IVerifyExperimentExecutor.java |  3 +-
 .../IVerifyExperimentsOperationExecutor.java  |  3 +-
 .../experiment/MapExperimentByIdExecutor.java |  3 +-
 .../experiment/SearchExperimentExecutor.java  |  3 +-
 .../SearchExperimentTypeExecutor.java         |  3 +-
 ...earchExperimentTypesOperationExecutor.java |  3 +-
 .../SearchExperimentsOperationExecutor.java   |  3 +-
 .../SetExperimentProjectExecutor.java         |  3 +-
 .../experiment/SetExperimentTypeExecutor.java |  3 +-
 .../UpdateExperimentAttachmentExecutor.java   |  3 +-
 .../experiment/UpdateExperimentExecutor.java  |  3 +-
 .../UpdateExperimentProjectExecutor.java      |  3 +-
 .../UpdateExperimentPropertyExecutor.java     |  3 +-
 .../UpdateExperimentTypeExecutor.java         |  3 +-
 ...teExperimentTypePropertyTypesExecutor.java |  3 +-
 ...pdateExperimentTypesOperationExecutor.java |  3 +-
 .../UpdateExperimentsOperationExecutor.java   |  3 +-
 .../experiment/VerifyExperimentExecutor.java  |  3 +-
 .../VerifyExperimentsOperationExecutor.java   |  3 +-
 .../executor/externaldms/AddressMatcher.java  |  3 +-
 .../CreateExternalDmsExecutor.java            |  2 +-
 .../CreateExternalDmsOperationExecutor.java   |  3 +-
 .../DeleteExternalDmsExecutor.java            |  3 +-
 .../DeleteExternalDmsOperationExecutor.java   |  3 +-
 .../ExternalDmsAuthorizationExecutor.java     |  3 +-
 .../externaldms/ExternalDmsTypeMatcher.java   |  3 +-
 .../GetExternalDmsOperationExecutor.java      |  3 +-
 .../ICreateExternalDmsExecutor.java           |  3 +-
 .../ICreateExternalDmsOperationExecutor.java  |  3 +-
 .../IDeleteExternalDmsExecutor.java           |  3 +-
 .../IDeleteExternalDmsOperationExecutor.java  |  3 +-
 .../IExternalDmsAuthorizationExecutor.java    |  3 +-
 .../IGetExternalDmsOperationExecutor.java     |  3 +-
 .../IMapExternalDmsByIdExecutor.java          |  3 +-
 .../IMapExternalDmsTechIdByIdExecutor.java    |  3 +-
 .../ISearchExternalDmsExecutor.java           |  3 +-
 .../ISearchExternalDmsOperationExecutor.java  |  3 +-
 .../IUpdateExternalDmsExecutor.java           |  3 +-
 .../IUpdateExternalDmsOperationExecutor.java  |  3 +-
 .../v3/executor/externaldms/LabelMatcher.java |  3 +-
 .../MapExternalDmsByIdExecutor.java           |  3 +-
 .../MapExternalDmsTechIdByIdExecutor.java     |  3 +-
 .../SearchExternalDmsExecutor.java            |  3 +-
 .../SearchExternalDmsOperationExecutor.java   |  3 +-
 .../UpdateExternalDmsExecutor.java            |  3 +-
 .../UpdateExternalDmsOperationExecutor.java   |  3 +-
 .../GlobalAuthorizationExecutor.java          |  3 +-
 .../globalsearch/GlobalSearchExecutor.java    |  3 +-
 .../IGlobalAuthorizationExecutor.java         |  3 +-
 .../globalsearch/IGlobalSearchExecutor.java   |  3 +-
 .../ISearchGloballyOperationExecutor.java     |  3 +-
 .../SearchGloballyOperationExecutor.java      |  3 +-
 .../material/CreateMaterialExecutor.java      |  3 +-
 .../material/CreateMaterialTypesExecutor.java |  3 +-
 .../CreateMaterialTypesOperationExecutor.java |  3 +-
 .../CreateMaterialsOperationExecutor.java     |  3 +-
 .../material/DeleteMaterialExecutor.java      |  3 +-
 .../DeleteMaterialTypesOperationExecutor.java |  3 +-
 .../DeleteMaterialsOperationExecutor.java     |  3 +-
 .../GetMaterialTypesOperationExecutor.java    |  3 +-
 .../GetMaterialsOperationExecutor.java        |  3 +-
 .../material/ICreateMaterialExecutor.java     |  3 +-
 .../material/ICreateMaterialTypeExecutor.java |  3 +-
 ...ICreateMaterialTypesOperationExecutor.java |  3 +-
 .../ICreateMaterialsOperationExecutor.java    |  3 +-
 .../material/IDeleteMaterialExecutor.java     |  3 +-
 ...IDeleteMaterialTypesOperationExecutor.java |  3 +-
 .../IDeleteMaterialsOperationExecutor.java    |  3 +-
 .../IGetMaterialTypesOperationExecutor.java   |  3 +-
 .../IGetMaterialsOperationExecutor.java       |  3 +-
 .../material/IMapMaterialByIdExecutor.java    |  3 +-
 .../IMapMaterialTechIdByIdExecutor.java       |  3 +-
 .../IMaterialAuthorizationExecutor.java       |  3 +-
 .../IMaterialTypeAuthorizationExecutor.java   |  3 +-
 .../material/ISearchMaterialExecutor.java     |  3 +-
 .../material/ISearchMaterialTypeExecutor.java |  3 +-
 ...ISearchMaterialTypesOperationExecutor.java |  3 +-
 .../ISearchMaterialsOperationExecutor.java    |  3 +-
 .../material/ISetMaterialTypeExecutor.java    |  3 +-
 .../material/IUpdateMaterialExecutor.java     |  3 +-
 .../IUpdateMaterialPropertyExecutor.java      |  3 +-
 .../material/IUpdateMaterialTypeExecutor.java |  3 +-
 ...dateMaterialTypePropertyTypesExecutor.java |  3 +-
 ...IUpdateMaterialTypesOperationExecutor.java |  3 +-
 .../IUpdateMaterialsOperationExecutor.java    |  3 +-
 .../material/IVerifyMaterialExecutor.java     |  3 +-
 .../IVerifyMaterialsOperationExecutor.java    |  3 +-
 .../material/MapMaterialByIdExecutor.java     |  3 +-
 .../MapMaterialTechIdByIdExecutor.java        |  3 +-
 .../MaterialAuthorizationExecutor.java        |  3 +-
 .../MaterialTypeAuthorizationExecutor.java    |  3 +-
 .../material/SearchMaterialExecutor.java      |  3 +-
 .../material/SearchMaterialTypeExecutor.java  |  3 +-
 .../SearchMaterialTypesOperationExecutor.java |  3 +-
 .../SearchMaterialsOperationExecutor.java     |  3 +-
 .../material/SetMaterialTypeExecutor.java     |  3 +-
 .../material/UpdateMaterialExecutor.java      |  3 +-
 .../UpdateMaterialPropertyExecutor.java       |  3 +-
 .../material/UpdateMaterialTypeExecutor.java  |  3 +-
 ...dateMaterialTypePropertyTypesExecutor.java |  3 +-
 .../UpdateMaterialTypesOperationExecutor.java |  3 +-
 .../UpdateMaterialsOperationExecutor.java     |  3 +-
 .../material/VerifyMaterialExecutor.java      |  3 +-
 .../VerifyMaterialsOperationExecutor.java     |  3 +-
 ...KindModificationAuthorizationExecutor.java |  3 +-
 ...ISearchObjectKindModificationExecutor.java |  3 +-
 ...ectKindModificationsOperationExecutor.java |  3 +-
 ...KindModificationAuthorizationExecutor.java |  3 +-
 .../SearchObjectKindModificationExecutor.java |  3 +-
 ...ectKindModificationsOperationExecutor.java |  3 +-
 .../AsynchronousOperationExecutor.java        |  3 +-
 ...ynchronousOperationThreadPoolExecutor.java |  3 +-
 .../operation/ExecuteOperationExecutor.java   |  3 +-
 .../IAsynchronousOperationExecutor.java       |  3 +-
 ...ynchronousOperationThreadPoolExecutor.java |  3 +-
 .../operation/IExecuteOperationExecutor.java  |  3 +-
 ...erationExecutionAuthorizationExecutor.java |  3 +-
 .../IOperationExecutionIdFactory.java         |  3 +-
 .../operation/IOperationsExecutor.java        |  3 +-
 .../ISynchronousOperationExecutor.java        |  3 +-
 ...erationExecutionAuthorizationExecutor.java |  3 +-
 .../operation/OperationListenerLoader.java    | 15 ++++
 .../operation/OperationsExecutor.java         |  3 +-
 .../SynchronousOperationExecutor.java         |  3 +-
 .../config/IOperationExecutionConfig.java     |  3 +-
 .../config/OperationExecutionConfig.java      |  3 +-
 .../DeleteOperationExecutionExecutor.java     |  3 +-
 ...eOperationExecutionsOperationExecutor.java |  3 +-
 .../IDeleteOperationExecutionExecutor.java    |  3 +-
 ...eOperationExecutionsOperationExecutor.java |  3 +-
 ...tOperationExecutionsOperationExecutor.java |  3 +-
 ...tOperationExecutionsOperationExecutor.java |  3 +-
 .../internal/IInternalOperation.java          |  3 +-
 .../internal/IInternalOperationExecutor.java  |  3 +-
 .../internal/IInternalOperationResult.java    |  3 +-
 .../internal/InternalOperationExecutor.java   |  3 +-
 .../IOperationExecutionEmailNotifier.java     |  3 +-
 .../IOperationExecutionNotifier.java          |  3 +-
 .../OperationExecutionEmailNotifier.java      |  3 +-
 .../OperationExecutionNotifier.java           |  3 +-
 ...hOperationExecutionsOperationExecutor.java |  3 +-
 ...hOperationExecutionsOperationExecutor.java |  3 +-
 .../store/IOperationExecutionDBStore.java     |  3 +-
 .../store/IOperationExecutionDBStoreDAO.java  |  3 +-
 .../store/IOperationExecutionFSStore.java     |  3 +-
 .../store/IOperationExecutionStore.java       |  3 +-
 .../store/OperationExecutionDBStore.java      |  3 +-
 .../store/OperationExecutionDBStoreDAO.java   |  3 +-
 .../store/OperationExecutionDirectory.java    |  3 +-
 .../operation/store/OperationExecutionFS.java |  3 +-
 .../OperationExecutionFSFetchOptions.java     |  3 +-
 .../store/OperationExecutionFSStore.java      |  3 +-
 .../store/OperationExecutionStore.java        |  3 +-
 .../IUpdateOperationExecutionExecutor.java    |  3 +-
 ...eOperationExecutionsOperationExecutor.java |  3 +-
 .../UpdateOperationExecutionExecutor.java     |  3 +-
 ...eOperationExecutionsOperationExecutor.java |  3 +-
 .../CreatePersonalAccessTokenExecutor.java    |  3 +-
 ...PersonalAccessTokensOperationExecutor.java |  3 +-
 .../DeletePersonalAccessTokenExecutor.java    |  3 +-
 ...PersonalAccessTokensOperationExecutor.java |  3 +-
 ...PersonalAccessTokensOperationExecutor.java |  3 +-
 .../ICreatePersonalAccessTokenExecutor.java   |  3 +-
 ...PersonalAccessTokensOperationExecutor.java |  3 +-
 .../IDeletePersonalAccessTokenExecutor.java   |  3 +-
 ...PersonalAccessTokensOperationExecutor.java |  3 +-
 ...PersonalAccessTokensOperationExecutor.java |  3 +-
 .../IMapPersonalAccessTokenByIdExecutor.java  |  3 +-
 ...sonalAccessTokenAuthorizationExecutor.java |  3 +-
 .../ISearchPersonalAccessTokenExecutor.java   |  3 +-
 ...PersonalAccessTokensOperationExecutor.java |  3 +-
 .../IUpdatePersonalAccessTokenExecutor.java   |  3 +-
 ...PersonalAccessTokensOperationExecutor.java |  3 +-
 .../MapPersonalAccessTokenByIdExecutor.java   |  3 +-
 ...sonalAccessTokenAuthorizationExecutor.java |  3 +-
 .../SearchPersonalAccessTokenExecutor.java    |  3 +-
 ...PersonalAccessTokensOperationExecutor.java |  3 +-
 .../UpdatePersonalAccessTokenExecutor.java    |  3 +-
 ...PersonalAccessTokensOperationExecutor.java |  3 +-
 .../executor/person/CreatePersonExecutor.java |  3 +-
 .../CreatePersonsOperationExecutor.java       |  3 +-
 .../executor/person/DeletePersonExecutor.java |  3 +-
 .../DeletePersonsOperationExecutor.java       |  3 +-
 .../person/GetPersonsOperationExecutor.java   |  3 +-
 .../person/ICreatePersonExecutor.java         |  3 +-
 .../ICreatePersonsOperationExecutor.java      |  3 +-
 .../person/IDeletePersonExecutor.java         |  3 +-
 .../IDeletePersonsOperationExecutor.java      |  3 +-
 .../person/IGetPersonsOperationExecutor.java  |  3 +-
 .../person/IMapPersonByIdExecutor.java        |  3 +-
 .../person/IMapPersonIdByIdExecutor.java      |  3 +-
 .../person/IPersonAuthorizationExecutor.java  |  3 +-
 .../person/ISearchPersonExecutor.java         |  3 +-
 .../ISearchPersonsOperationExecutor.java      |  3 +-
 .../person/ISetPersonSpaceExecutor.java       |  3 +-
 .../person/IUpdateHomeSpaceExecutor.java      |  3 +-
 .../person/IUpdatePersonExecutor.java         |  3 +-
 .../IUpdatePersonsOperationExecutor.java      |  3 +-
 .../person/IUpdateWebAppSettingsExecutor.java |  3 +-
 .../person/MapPersonByIdExecutor.java         |  3 +-
 .../person/MapPersonIdByIdExecutor.java       |  3 +-
 .../person/PersonAuthorizationExecutor.java   |  3 +-
 .../executor/person/SearchPersonExecutor.java |  3 +-
 .../SearchPersonsOperationExecutor.java       |  3 +-
 .../person/SetPersonSpaceExecutor.java        |  3 +-
 .../person/UpdateHomeSpaceExecutor.java       |  3 +-
 .../executor/person/UpdatePersonExecutor.java |  3 +-
 .../UpdatePersonsOperationExecutor.java       |  3 +-
 .../person/UpdateWebAppSettingsExecutor.java  |  3 +-
 .../executor/plugin/CreatePluginExecutor.java |  3 +-
 .../CreatePluginsOperationExecutor.java       |  3 +-
 .../executor/plugin/DeletePluginExecutor.java |  3 +-
 .../DeletePluginsOperationExecutor.java       |  3 +-
 .../plugin/EvaluatePluginExecutor.java        |  3 +-
 .../EvaluatePluginOperationExecutor.java      |  3 +-
 .../plugin/GetPluginsOperationExecutor.java   |  3 +-
 .../plugin/ICreatePluginExecutor.java         |  3 +-
 .../ICreatePluginsOperationExecutor.java      |  3 +-
 .../plugin/IDeletePluginExecutor.java         |  3 +-
 .../IDeletePluginsOperationExecutor.java      |  3 +-
 .../plugin/IEvaluatePluginExecutor.java       |  3 +-
 .../IEvaluatePluginOperationExecutor.java     |  3 +-
 .../plugin/IGetPluginsOperationExecutor.java  |  3 +-
 .../plugin/IMapPluginByIdExecutor.java        |  3 +-
 .../plugin/IPluginAuthorizationExecutor.java  |  3 +-
 .../plugin/ISearchPluginExecutor.java         |  3 +-
 .../ISearchPluginsOperationExecutor.java      |  3 +-
 .../plugin/IUpdatePluginExecutor.java         |  3 +-
 .../IUpdatePluginsOperationExecutor.java      |  3 +-
 .../plugin/MapPluginByIdExecutor.java         |  3 +-
 .../plugin/PluginAuthorizationExecutor.java   |  3 +-
 .../executor/plugin/SearchPluginExecutor.java |  3 +-
 .../SearchPluginsOperationExecutor.java       |  3 +-
 .../executor/plugin/UpdatePluginExecutor.java |  3 +-
 .../UpdatePluginsOperationExecutor.java       |  3 +-
 .../project/CreateProjectExecutor.java        |  3 +-
 .../CreateProjectsOperationExecutor.java      |  3 +-
 .../project/DeleteProjectExecutor.java        |  3 +-
 .../DeleteProjectsOperationExecutor.java      |  3 +-
 .../project/GetProjectsOperationExecutor.java |  3 +-
 .../project/ICreateProjectExecutor.java       |  3 +-
 .../ICreateProjectsOperationExecutor.java     |  3 +-
 .../project/IDeleteProjectExecutor.java       |  3 +-
 .../IDeleteProjectsOperationExecutor.java     |  3 +-
 .../IGetProjectsOperationExecutor.java        |  3 +-
 .../project/IMapProjectByIdExecutor.java      |  3 +-
 .../IMapProjectTechIdByIdExecutor.java        |  3 +-
 .../IProjectAuthorizationExecutor.java        |  3 +-
 .../project/ISearchProjectExecutor.java       |  3 +-
 .../ISearchProjectsOperationExecutor.java     |  3 +-
 .../project/ISetProjectLeaderExecutor.java    |  3 +-
 .../project/ISetProjectSpaceExecutor.java     |  3 +-
 .../IUpdateProjectAttachmentExecutor.java     |  3 +-
 .../project/IUpdateProjectExecutor.java       |  3 +-
 .../project/IUpdateProjectSpaceExecutor.java  |  3 +-
 .../IUpdateProjectsOperationExecutor.java     |  3 +-
 .../project/MapProjectByIdExecutor.java       |  3 +-
 .../project/MapProjectTechIdByIdExecutor.java |  3 +-
 .../project/ProjectAuthorizationExecutor.java |  3 +-
 .../project/SearchProjectExecutor.java        |  3 +-
 .../SearchProjectsOperationExecutor.java      |  3 +-
 .../project/SetProjectLeaderExecutor.java     |  3 +-
 .../project/SetProjectSpaceExecutor.java      |  3 +-
 .../UpdateProjectAttachmentExecutor.java      |  3 +-
 .../project/UpdateProjectExecutor.java        |  3 +-
 .../project/UpdateProjectSpaceExecutor.java   |  3 +-
 .../UpdateProjectsOperationExecutor.java      |  3 +-
 .../property/CreatePropertyTypeExecutor.java  |  3 +-
 .../CreatePropertyTypesOperationExecutor.java |  3 +-
 .../property/DeletePropertyTypeExecutor.java  |  3 +-
 .../DeletePropertyTypesOperationExecutor.java |  3 +-
 .../GetPropertyTypesOperationExecutor.java    |  3 +-
 ...IAbstractUpdateEntityPropertyExecutor.java |  3 +-
 .../property/ICreatePropertyTypeExecutor.java |  3 +-
 ...ICreatePropertyTypesOperationExecutor.java |  3 +-
 .../property/IDeletePropertyTypeExecutor.java |  3 +-
 ...IDeletePropertyTypesOperationExecutor.java |  3 +-
 .../IGetPropertyTypesOperationExecutor.java   |  3 +-
 .../IMapPropertyAssignmentByIdExecutor.java   |  3 +-
 .../IMapPropertyTypeByIdExecutor.java         |  3 +-
 .../property/IPropertiesConverter.java        |  3 +-
 .../IPropertyTypeAuthorizationExecutor.java   |  3 +-
 .../ISearchPropertyAssignmentExecutor.java    |  3 +-
 ...hPropertyAssignmentsOperationExecutor.java |  3 +-
 .../property/ISearchPropertyTypeExecutor.java |  3 +-
 ...ISearchPropertyTypesOperationExecutor.java |  3 +-
 .../ISetPropertyTypeMaterialTypeExecutor.java |  3 +-
 .../ISetPropertyTypeSampleTypeExecutor.java   | 15 ++++
 .../ISetPropertyTypeVocabularyExecutor.java   |  3 +-
 .../IUpdateEntityPropertyExecutor.java        |  3 +-
 .../property/IUpdatePropertyTypeExecutor.java |  3 +-
 ...IUpdatePropertyTypesOperationExecutor.java |  3 +-
 .../IVerifyEntityPropertyExecutor.java        |  3 +-
 .../MapPropertyAssignmentByIdExecutor.java    |  3 +-
 .../property/MapPropertyTypeByIdExecutor.java |  3 +-
 .../property/PropertiesConverter.java         |  3 +-
 .../PropertyTypeAuthorizationExecutor.java    |  3 +-
 .../SearchPropertyAssignmentExecutor.java     |  3 +-
 ...hPropertyAssignmentsOperationExecutor.java |  3 +-
 .../property/SearchPropertyTypeExecutor.java  |  3 +-
 .../SearchPropertyTypesOperationExecutor.java |  3 +-
 .../SetPropertyTypeMaterialTypeExecutor.java  |  3 +-
 .../SetPropertyTypeSampleTypeExecutor.java    | 15 ++++
 .../SetPropertyTypeVocabularyExecutor.java    |  3 +-
 .../UpdateEntityPropertyExecutor.java         |  3 +-
 .../property/UpdatePropertyTypeExecutor.java  |  3 +-
 .../UpdatePropertyTypesOperationExecutor.java |  3 +-
 .../VerifyEntityPropertyExecutor.java         |  3 +-
 .../query/AbstractExecuteExecutor.java        |  3 +-
 .../query/CreateQueriesOperationExecutor.java |  3 +-
 .../executor/query/CreateQueryExecutor.java   |  3 +-
 .../query/DeleteQueriesOperationExecutor.java |  3 +-
 .../executor/query/DeleteQueryExecutor.java   |  3 +-
 .../executor/query/ExecuteQueryExecutor.java  |  3 +-
 .../query/ExecuteQueryOperationExecutor.java  |  3 +-
 .../v3/executor/query/ExecuteSqlExecutor.java |  3 +-
 .../query/ExecuteSqlOperationExecutor.java    |  3 +-
 .../query/GetQueriesOperationExecutor.java    |  3 +-
 .../GetQueryDatabasesOperationExecutor.java   |  3 +-
 .../ICreateQueriesOperationExecutor.java      |  3 +-
 .../executor/query/ICreateQueryExecutor.java  |  3 +-
 .../IDeleteQueriesOperationExecutor.java      |  3 +-
 .../executor/query/IDeleteQueryExecutor.java  |  3 +-
 .../executor/query/IExecuteQueryExecutor.java |  3 +-
 .../query/IExecuteQueryOperationExecutor.java |  3 +-
 .../executor/query/IExecuteSqlExecutor.java   |  3 +-
 .../query/IExecuteSqlOperationExecutor.java   |  3 +-
 .../query/IGetQueriesOperationExecutor.java   |  3 +-
 .../IGetQueryDatabasesOperationExecutor.java  |  3 +-
 .../executor/query/IMapQueryByIdExecutor.java |  3 +-
 .../query/IMapQueryDatabaseByIdExecutor.java  |  3 +-
 .../query/IQueryAuthorizationExecutor.java    |  3 +-
 .../IQueryDatabaseAuthorizationExecutor.java  |  3 +-
 .../ISearchQueriesOperationExecutor.java      |  3 +-
 .../query/ISearchQueryDatabaseExecutor.java   |  3 +-
 ...SearchQueryDatabasesOperationExecutor.java |  3 +-
 .../executor/query/ISearchQueryExecutor.java  |  3 +-
 .../query/ISetQueryDatabaseExecutor.java      |  3 +-
 .../IUpdateQueriesOperationExecutor.java      |  3 +-
 .../query/IUpdateQueryDatabaseExecutor.java   |  3 +-
 .../executor/query/IUpdateQueryExecutor.java  |  3 +-
 .../executor/query/MapQueryByIdExecutor.java  |  3 +-
 .../query/MapQueryDatabaseByIdExecutor.java   |  3 +-
 .../query/QueryAuthorizationExecutor.java     |  3 +-
 .../QueryDatabaseAuthorizationExecutor.java   |  3 +-
 .../query/SearchQueriesOperationExecutor.java |  3 +-
 .../query/SearchQueryDatabaseExecutor.java    |  3 +-
 ...SearchQueryDatabasesOperationExecutor.java |  3 +-
 .../executor/query/SearchQueryExecutor.java   |  3 +-
 .../query/SetQueryDatabaseExecutor.java       |  3 +-
 .../query/UpdateQueriesOperationExecutor.java |  3 +-
 .../query/UpdateQueryDatabaseExecutor.java    |  3 +-
 .../executor/query/UpdateQueryExecutor.java   |  3 +-
 .../GetRelationshipIdExecutor.java            |  3 +-
 .../IGetRelationshipIdExecutor.java           |  3 +-
 .../v3/executor/rights/GetRightsExecutor.java |  3 +-
 .../rights/GetRightsOperationExecutor.java    |  3 +-
 .../executor/rights/IGetRightsExecutor.java   |  3 +-
 .../rights/IGetRightsOperationExecutor.java   |  3 +-
 .../CreateRoleAssignmentExecutor.java         |  3 +-
 ...reateRoleAssignmentsOperationExecutor.java |  3 +-
 .../DeleteRoleAssignmentExecutor.java         |  3 +-
 ...eleteRoleAssignmentsOperationExecutor.java |  3 +-
 .../GetRoleAssignmentsOperationExecutor.java  |  3 +-
 .../ICreateRoleAssignmentExecutor.java        |  3 +-
 ...reateRoleAssignmentsOperationExecutor.java |  3 +-
 .../IDeleteRoleAssignmentExecutor.java        |  3 +-
 ...eleteRoleAssignmentsOperationExecutor.java |  3 +-
 .../IGetRoleAssignmentsOperationExecutor.java |  3 +-
 .../IMapRoleAssignmentPEByIdExecutor.java     |  3 +-
 .../IMapRoleAssignmentTechIdByIdExecutor.java |  3 +-
 .../IRoleAssignmentAuthorizationExecutor.java |  3 +-
 .../ISearchRoleAssignmentExecutor.java        |  3 +-
 ...earchRoleAssignmentsOperationExecutor.java |  3 +-
 ...eAssignmentAuthorizationGroupExecutor.java |  3 +-
 .../ISetRoleAssignmentProjectExecutor.java    |  3 +-
 .../ISetRoleAssignmentSpaceExecutor.java      |  3 +-
 .../ISetRoleAssignmentUserExecutor.java       |  3 +-
 .../MapRoleAssignmentPEByIdExecutor.java      |  3 +-
 .../MapRoleAssignmentTechIdByIdExecutor.java  |  3 +-
 .../RoleAssignmentAuthorizationExecutor.java  |  3 +-
 .../SearchRoleAssignmentExecutor.java         |  3 +-
 ...earchRoleAssignmentsOperationExecutor.java |  3 +-
 ...eAssignmentAuthorizationGroupExecutor.java |  3 +-
 .../SetRoleAssignmentProjectExecutor.java     |  3 +-
 .../SetRoleAssignmentSpaceExecutor.java       |  3 +-
 .../SetRoleAssignmentUserExecutor.java        |  3 +-
 ...leToSampleParentChildRelationExecutor.java |  3 +-
 .../executor/sample/CreateSampleExecutor.java |  3 +-
 .../sample/CreateSampleTypesExecutor.java     |  3 +-
 .../CreateSampleTypesOperationExecutor.java   |  3 +-
 .../CreateSamplesOperationExecutor.java       |  3 +-
 .../executor/sample/DeleteSampleExecutor.java |  3 +-
 .../DeleteSampleTypesOperationExecutor.java   |  3 +-
 .../DeleteSamplesOperationExecutor.java       |  3 +-
 .../GetSampleTypesOperationExecutor.java      |  3 +-
 .../sample/GetSamplesOperationExecutor.java   |  3 +-
 .../sample/ICreateSampleExecutor.java         |  3 +-
 .../sample/ICreateSampleTypeExecutor.java     |  3 +-
 .../ICreateSampleTypesOperationExecutor.java  |  3 +-
 .../ICreateSamplesOperationExecutor.java      |  3 +-
 .../sample/IDeleteSampleExecutor.java         |  3 +-
 .../IDeleteSampleTypesOperationExecutor.java  |  3 +-
 .../IDeleteSamplesOperationExecutor.java      |  3 +-
 .../IGetSampleTypesOperationExecutor.java     |  3 +-
 .../sample/IGetSamplesOperationExecutor.java  |  3 +-
 .../sample/IMapSampleByIdExecutor.java        |  3 +-
 .../sample/IMapSampleTechIdByIdExecutor.java  |  3 +-
 .../sample/ISampleAuthorizationExecutor.java  |  3 +-
 .../ISampleTypeAuthorizationExecutor.java     |  3 +-
 .../sample/ISearchSampleExecutor.java         |  3 +-
 .../sample/ISearchSampleTypeExecutor.java     |  3 +-
 .../ISearchSampleTypesOperationExecutor.java  |  3 +-
 .../ISearchSamplesOperationExecutor.java      |  3 +-
 .../sample/ISetSampleChildrenExecutor.java    |  3 +-
 .../sample/ISetSampleComponentsExecutor.java  |  3 +-
 .../sample/ISetSampleContainerExecutor.java   |  3 +-
 .../sample/ISetSampleExperimentExecutor.java  |  3 +-
 .../sample/ISetSampleParentsExecutor.java     |  3 +-
 .../sample/ISetSampleProjectExecutor.java     |  3 +-
 .../ISetSampleRelatedSamplesExecutor.java     |  3 +-
 .../sample/ISetSampleSpaceExecutor.java       |  3 +-
 .../sample/ISetSampleTypeExecutor.java        |  3 +-
 .../IUpdateSampleAttachmentExecutor.java      |  3 +-
 .../sample/IUpdateSampleChildrenExecutor.java |  3 +-
 .../IUpdateSampleComponentsExecutor.java      |  3 +-
 .../IUpdateSampleContainerExecutor.java       |  3 +-
 .../sample/IUpdateSampleExecutor.java         |  3 +-
 .../IUpdateSampleExperimentExecutor.java      |  3 +-
 .../sample/IUpdateSampleParentsExecutor.java  |  3 +-
 .../sample/IUpdateSampleProjectExecutor.java  |  3 +-
 .../sample/IUpdateSamplePropertyExecutor.java |  3 +-
 .../IUpdateSampleRelatedSamplesExecutor.java  |  3 +-
 .../sample/IUpdateSampleSpaceExecutor.java    |  3 +-
 .../sample/IUpdateSampleTypeExecutor.java     |  3 +-
 ...UpdateSampleTypePropertyTypesExecutor.java |  3 +-
 .../IUpdateSampleTypesOperationExecutor.java  |  3 +-
 .../IUpdateSamplesOperationExecutor.java      |  3 +-
 .../IVerifySampleContainerExecutor.java       |  3 +-
 .../sample/IVerifySampleDataSetsExecutor.java |  3 +-
 .../sample/IVerifySampleExecutor.java         |  3 +-
 .../IVerifySampleExperimentExecutor.java      |  3 +-
 .../sample/IVerifySampleParentsExecutor.java  |  3 +-
 .../sample/IVerifySampleProjectExecutor.java  |  3 +-
 .../IVerifySamplesOperationExecutor.java      |  3 +-
 .../sample/MapSampleByIdExecutor.java         |  3 +-
 .../sample/MapSampleTechIdByIdExecutor.java   |  3 +-
 .../sample/SampleAuthorizationExecutor.java   |  3 +-
 .../SampleTypeAuthorizationExecutor.java      |  3 +-
 .../executor/sample/SearchSampleExecutor.java |  3 +-
 .../sample/SearchSampleTypeExecutor.java      |  3 +-
 .../SearchSampleTypesOperationExecutor.java   |  3 +-
 .../SearchSamplesOperationExecutor.java       |  3 +-
 .../sample/SetSampleChildrenExecutor.java     |  3 +-
 .../sample/SetSampleComponentsExecutor.java   |  3 +-
 .../sample/SetSampleContainerExecutor.java    |  3 +-
 .../sample/SetSampleExperimentExecutor.java   |  3 +-
 .../sample/SetSampleParentsExecutor.java      |  3 +-
 .../sample/SetSampleProjectExecutor.java      |  3 +-
 .../sample/SetSampleSpaceExecutor.java        |  3 +-
 ...leToSampleParentChildRelationExceutor.java |  3 +-
 .../SetSampleToSamplesRelationExecutor.java   |  3 +-
 .../sample/SetSampleTypeExecutor.java         |  3 +-
 .../UpdateSampleAttachmentExecutor.java       |  3 +-
 .../sample/UpdateSampleChildrenExecutor.java  |  3 +-
 .../UpdateSampleComponentsExecutor.java       |  3 +-
 .../sample/UpdateSampleContainerExecutor.java |  3 +-
 .../executor/sample/UpdateSampleExecutor.java |  3 +-
 .../UpdateSampleExperimentExecutor.java       |  3 +-
 .../sample/UpdateSampleParentsExecutor.java   |  3 +-
 .../sample/UpdateSampleProjectExecutor.java   |  3 +-
 .../sample/UpdateSamplePropertyExecutor.java  |  3 +-
 .../UpdateSampleRelatedSamplesExecutor.java   |  3 +-
 .../sample/UpdateSampleSpaceExecutor.java     |  3 +-
 .../sample/UpdateSampleTypeExecutor.java      |  3 +-
 ...UpdateSampleTypePropertyTypesExecutor.java |  3 +-
 .../UpdateSampleTypesOperationExecutor.java   |  3 +-
 .../UpdateSamplesOperationExecutor.java       |  3 +-
 .../sample/VerifySampleContainerExecutor.java |  3 +-
 .../sample/VerifySampleDataSetsExecutor.java  |  3 +-
 .../executor/sample/VerifySampleExecutor.java |  3 +-
 .../VerifySampleExperimentExecutor.java       |  3 +-
 .../sample/VerifySampleParentsExecutor.java   |  3 +-
 .../sample/VerifySampleProjectExecutor.java   |  3 +-
 .../VerifySamplesOperationExecutor.java       |  3 +-
 .../CreateSemanticAnnotationExecutor.java     |  3 +-
 ...eSemanticAnnotationsOperationExecutor.java |  3 +-
 .../DeleteSemanticAnnotationExecutor.java     |  3 +-
 ...eSemanticAnnotationsOperationExecutor.java |  3 +-
 ...tSemanticAnnotationsOperationExecutor.java |  3 +-
 .../ICreateSemanticAnnotationExecutor.java    |  3 +-
 ...eSemanticAnnotationsOperationExecutor.java |  3 +-
 .../IDeleteSemanticAnnotationExecutor.java    |  3 +-
 ...eSemanticAnnotationsOperationExecutor.java |  3 +-
 ...tSemanticAnnotationsOperationExecutor.java |  3 +-
 .../IMapSemanticAnnotationByIdExecutor.java   |  3 +-
 ...pSemanticAnnotationTechIdByIdExecutor.java |  3 +-
 .../ISearchSemanticAnnotationExecutor.java    |  3 +-
 ...hSemanticAnnotationsOperationExecutor.java |  3 +-
 ...manticAnnotationAuthorizationExecutor.java |  3 +-
 ...tSemanticAnnotationEntityTypeExecutor.java |  3 +-
 ...cAnnotationPropertyAssignmentExecutor.java |  3 +-
 ...emanticAnnotationPropertyTypeExecutor.java |  3 +-
 .../IUpdateSemanticAnnotationExecutor.java    |  3 +-
 ...eSemanticAnnotationsOperationExecutor.java |  3 +-
 .../MapSemanticAnnotationByIdExecutor.java    |  3 +-
 ...pSemanticAnnotationTechIdByIdExecutor.java |  3 +-
 .../SearchSemanticAnnotationExecutor.java     |  3 +-
 ...hSemanticAnnotationsOperationExecutor.java |  3 +-
 ...manticAnnotationAuthorizationExecutor.java |  3 +-
 ...tSemanticAnnotationEntityTypeExecutor.java |  3 +-
 ...cAnnotationPropertyAssignmentExecutor.java |  3 +-
 ...emanticAnnotationPropertyTypeExecutor.java |  3 +-
 .../UpdateSemanticAnnotationExecutor.java     |  3 +-
 ...eSemanticAnnotationsOperationExecutor.java |  3 +-
 ...bstractDataSetBasedDssServiceExecutor.java |  3 +-
 .../service/AbstractDssServiceExecutor.java   |  3 +-
 ...gregationServiceAuthorizationExecutor.java |  3 +-
 .../CustomASServiceAuthorizationExecutor.java |  3 +-
 .../service/CustomASServiceProvider.java      |  3 +-
 .../ExecuteAggregationServiceExecutor.java    |  3 +-
 ...teAggregationServiceOperationExecutor.java |  3 +-
 .../ExecuteCustomASServiceExecutor.java       |  3 +-
 ...ecuteCustomASServiceOperationExecutor.java |  3 +-
 .../ExecuteProcessingServiceExecutor.java     |  3 +-
 ...uteProcessingServiceOperationExecutor.java |  3 +-
 .../ExecuteReportingServiceExecutor.java      |  3 +-
 ...cuteReportingServiceOperationExecutor.java |  3 +-
 .../ExecuteSearchDomainServiceExecutor.java   |  3 +-
 ...eSearchDomainServiceOperationExecutor.java |  3 +-
 ...gregationServiceAuthorizationExecutor.java |  3 +-
 ...ICustomASServiceAuthorizationExecutor.java |  3 +-
 .../service/ICustomASServiceProvider.java     |  3 +-
 .../IExecuteAggregationServiceExecutor.java   |  3 +-
 ...teAggregationServiceOperationExecutor.java |  3 +-
 .../IExecuteCustomASServiceExecutor.java      |  3 +-
 ...ecuteCustomASServiceOperationExecutor.java |  3 +-
 .../IExecuteDssServiceOperationExecutor.java  |  3 +-
 .../IExecuteProcessingServiceExecutor.java    |  3 +-
 ...uteProcessingServiceOperationExecutor.java |  3 +-
 .../IExecuteReportingServiceExecutor.java     |  3 +-
 ...cuteReportingServiceOperationExecutor.java |  3 +-
 .../IExecuteSearchDomainServiceExecutor.java  |  3 +-
 ...eSearchDomainServiceOperationExecutor.java |  3 +-
 ...rocessingServiceAuthorizationExecutor.java |  3 +-
 ...ReportingServiceAuthorizationExecutor.java |  3 +-
 .../ISearchAggregationServiceExecutor.java    |  3 +-
 ...hAggregationServicesOperationExecutor.java |  3 +-
 .../ISearchCustomASServiceExecutor.java       |  3 +-
 ...archCustomASServicesOperationExecutor.java |  3 +-
 ...rchDomainServiceAuthorizationExecutor.java |  3 +-
 .../ISearchProcessingServiceExecutor.java     |  3 +-
 ...chProcessingServicesOperationExecutor.java |  3 +-
 .../ISearchReportingServiceExecutor.java      |  3 +-
 ...rchReportingServicesOperationExecutor.java |  3 +-
 .../ISearchSearchDomainServiceExecutor.java   |  3 +-
 ...SearchDomainServicesOperationExecutor.java |  3 +-
 ...rocessingServiceAuthorizationExecutor.java |  3 +-
 ...ReportingServiceAuthorizationExecutor.java |  3 +-
 .../SearchAggregationServiceExecutor.java     |  3 +-
 ...hAggregationServicesOperationExecutor.java |  3 +-
 .../SearchCustomASServiceExecutor.java        |  3 +-
 ...archCustomASServicesOperationExecutor.java |  3 +-
 ...rchDomainServiceAuthorizationExecutor.java |  3 +-
 .../SearchProcessingServiceExecutor.java      |  3 +-
 ...chProcessingServicesOperationExecutor.java |  3 +-
 .../SearchReportingServiceExecutor.java       |  3 +-
 ...rchReportingServicesOperationExecutor.java |  3 +-
 .../SearchSearchDomainServiceExecutor.java    |  3 +-
 ...SearchDomainServicesOperationExecutor.java |  3 +-
 .../GetSessionInformationExecutor.java        |  3 +-
 ...etSessionInformationOperationExecutor.java |  3 +-
 .../IGetSessionInformationExecutor.java       |  3 +-
 ...etSessionInformationOperationExecutor.java |  3 +-
 .../ISearchSessionInformationExecutor.java    |  3 +-
 ...chSessionInformationOperationExecutor.java |  3 +-
 ...ssionInformationAuthorizationExecutor.java |  3 +-
 .../SearchSessionInformationExecutor.java     |  3 +-
 ...chSessionInformationOperationExecutor.java |  3 +-
 ...ssionInformationAuthorizationExecutor.java |  3 +-
 .../executor/space/CreateSpaceExecutor.java   |  3 +-
 .../space/CreateSpacesOperationExecutor.java  |  3 +-
 .../executor/space/DeleteSpaceExecutor.java   |  3 +-
 .../space/DeleteSpacesOperationExecutor.java  |  3 +-
 .../space/GetSpacesOperationExecutor.java     |  3 +-
 .../executor/space/ICreateSpaceExecutor.java  |  3 +-
 .../space/ICreateSpacesOperationExecutor.java |  3 +-
 .../executor/space/IDeleteSpaceExecutor.java  |  3 +-
 .../space/IDeleteSpacesOperationExecutor.java |  3 +-
 .../space/IGetSpacesOperationExecutor.java    |  3 +-
 .../executor/space/IMapSpaceByIdExecutor.java |  3 +-
 .../space/IMapSpaceTechIdByIdExecutor.java    |  3 +-
 .../executor/space/ISearchSpaceExecutor.java  |  3 +-
 .../space/ISearchSpacesOperationExecutor.java |  3 +-
 .../space/ISpaceAuthorizationExecutor.java    |  3 +-
 .../executor/space/IUpdateSpaceExecutor.java  |  3 +-
 .../space/IUpdateSpacesOperationExecutor.java |  3 +-
 .../executor/space/MapSpaceByIdExecutor.java  |  3 +-
 .../space/MapSpaceTechIdByIdExecutor.java     |  3 +-
 .../executor/space/SearchSpaceExecutor.java   |  3 +-
 .../space/SearchSpacesOperationExecutor.java  |  3 +-
 .../space/SpaceAuthorizationExecutor.java     |  3 +-
 .../executor/space/UpdateSpaceExecutor.java   |  3 +-
 .../space/UpdateSpacesOperationExecutor.java  |  3 +-
 .../executor/tag/AddTagToEntityExecutor.java  |  3 +-
 .../tag/CreateMissingTagExecutor.java         |  3 +-
 .../v3/executor/tag/CreateTagExecutor.java    |  3 +-
 .../tag/CreateTagsOperationExecutor.java      |  3 +-
 .../v3/executor/tag/DeleteTagExecutor.java    |  3 +-
 .../tag/DeleteTagsOperationExecutor.java      |  3 +-
 .../tag/GetTagIdentifierExecutor.java         |  3 +-
 .../tag/GetTagsOperationExecutor.java         |  3 +-
 .../executor/tag/IAddTagToEntityExecutor.java |  3 +-
 .../tag/ICreateMissingTagExecutor.java        |  3 +-
 .../v3/executor/tag/ICreateTagExecutor.java   |  3 +-
 .../tag/ICreateTagsOperationExecutor.java     |  3 +-
 .../v3/executor/tag/IDeleteTagExecutor.java   |  3 +-
 .../tag/IDeleteTagsOperationExecutor.java     |  3 +-
 .../tag/IGetTagIdentifierExecutor.java        |  3 +-
 .../tag/IGetTagsOperationExecutor.java        |  3 +-
 .../v3/executor/tag/IMapTagByIdExecutor.java  |  3 +-
 .../tag/IRemoveTagFromEntityExecutor.java     |  3 +-
 .../v3/executor/tag/ISearchTagExecutor.java   |  3 +-
 .../tag/ISearchTagsOperationExecutor.java     |  3 +-
 .../executor/tag/ISetTagDataSetsExecutor.java |  3 +-
 .../tag/ISetTagExperimentsExecutor.java       |  3 +-
 .../tag/ISetTagForEntityExecutor.java         |  3 +-
 .../tag/ISetTagMaterialsExecutor.java         |  3 +-
 .../executor/tag/ISetTagSamplesExecutor.java  |  3 +-
 .../tag/ITagAuthorizationExecutor.java        |  3 +-
 .../tag/IUpdateTagDataSetsExecutor.java       |  3 +-
 .../IUpdateTagDataSetsWithCacheExecutor.java  |  3 +-
 .../v3/executor/tag/IUpdateTagExecutor.java   |  3 +-
 .../tag/IUpdateTagExperimentsExecutor.java    |  3 +-
 ...UpdateTagExperimentsWithCacheExecutor.java |  3 +-
 .../tag/IUpdateTagForEntityExecutor.java      |  3 +-
 .../tag/IUpdateTagMaterialsExecutor.java      |  3 +-
 .../IUpdateTagMaterialsWithCacheExecutor.java |  3 +-
 .../tag/IUpdateTagSamplesExecutor.java        |  3 +-
 .../IUpdateTagSamplesWithCacheExecutor.java   |  3 +-
 .../tag/IUpdateTagsOperationExecutor.java     |  3 +-
 .../v3/executor/tag/MapTagByIdExecutor.java   |  3 +-
 .../tag/RemoveTagFromEntityExecutor.java      |  3 +-
 .../v3/executor/tag/SearchTagExecutor.java    |  3 +-
 .../tag/SearchTagsOperationExecutor.java      |  3 +-
 .../executor/tag/SetTagDataSetsExecutor.java  |  3 +-
 .../executor/tag/SetTagEntitiesExecutor.java  |  3 +-
 .../tag/SetTagExperimentsExecutor.java        |  3 +-
 .../executor/tag/SetTagForEntityExecutor.java |  3 +-
 .../executor/tag/SetTagMaterialsExecutor.java |  3 +-
 .../executor/tag/SetTagSamplesExecutor.java   |  3 +-
 .../tag/TagAuthorizationExecutor.java         |  3 +-
 .../tag/UpdateTagDataSetsExecutor.java        |  3 +-
 .../UpdateTagDataSetsWithCacheExecutor.java   |  3 +-
 .../UpdateTagEntitiesWithCacheExecutor.java   |  3 +-
 .../v3/executor/tag/UpdateTagExecutor.java    |  3 +-
 .../tag/UpdateTagExperimentsExecutor.java     |  3 +-
 ...UpdateTagExperimentsWithCacheExecutor.java |  3 +-
 .../tag/UpdateTagForEntityExecutor.java       |  3 +-
 .../tag/UpdateTagMaterialsExecutor.java       |  3 +-
 .../UpdateTagMaterialsWithCacheExecutor.java  |  3 +-
 .../tag/UpdateTagSamplesExecutor.java         |  3 +-
 .../UpdateTagSamplesWithCacheExecutor.java    |  3 +-
 .../tag/UpdateTagsOperationExecutor.java      |  3 +-
 .../CreateVocabulariesOperationExecutor.java  |  3 +-
 .../vocabulary/CreateVocabularyExecutor.java  |  3 +-
 .../CreateVocabularyTermExecutor.java         |  3 +-
 ...reateVocabularyTermsOperationExecutor.java |  3 +-
 .../DeleteVocabulariesOperationExecutor.java  |  3 +-
 .../vocabulary/DeleteVocabularyExecutor.java  |  3 +-
 .../DeleteVocabularyTermExecutor.java         |  3 +-
 ...eleteVocabularyTermsOperationExecutor.java |  3 +-
 .../GetVocabulariesOperationExecutor.java     |  3 +-
 .../GetVocabularyTermsOperationExecutor.java  |  3 +-
 .../ICreateVocabulariesOperationExecutor.java |  3 +-
 .../vocabulary/ICreateVocabularyExecutor.java |  3 +-
 .../ICreateVocabularyTermExecutor.java        |  3 +-
 ...reateVocabularyTermsOperationExecutor.java |  3 +-
 .../IDeleteVocabulariesOperationExecutor.java |  3 +-
 .../vocabulary/IDeleteVocabularyExecutor.java |  3 +-
 .../IDeleteVocabularyTermExecutor.java        |  3 +-
 ...eleteVocabularyTermsOperationExecutor.java |  3 +-
 .../IGetVocabulariesOperationExecutor.java    |  3 +-
 .../IGetVocabularyTermsOperationExecutor.java |  3 +-
 .../IMapVocabularyByIdExecutor.java           |  3 +-
 .../IMapVocabularyTermByIdExecutor.java       |  3 +-
 .../ISearchVocabulariesOperationExecutor.java |  3 +-
 .../vocabulary/ISearchVocabularyExecutor.java |  3 +-
 .../ISearchVocabularyTermExecutor.java        |  3 +-
 ...earchVocabularyTermsOperationExecutor.java |  3 +-
 .../IUpdateVocabulariesOperationExecutor.java |  3 +-
 .../vocabulary/IUpdateVocabularyExecutor.java |  3 +-
 .../IUpdateVocabularyTermExecutor.java        |  3 +-
 ...pdateVocabularyTermsOperationExecutor.java |  3 +-
 .../IVocabularyAuthorizationExecutor.java     |  3 +-
 .../IVocabularyTermAuthorizationExecutor.java |  3 +-
 .../vocabulary/MapVocabularyByIdExecutor.java |  3 +-
 .../MapVocabularyTermByIdExecutor.java        |  3 +-
 .../SearchVocabulariesOperationExecutor.java  |  3 +-
 .../vocabulary/SearchVocabularyExecutor.java  |  3 +-
 .../SearchVocabularyTermExecutor.java         |  3 +-
 ...earchVocabularyTermsOperationExecutor.java |  3 +-
 .../UpdateVocabulariesOperationExecutor.java  |  3 +-
 .../vocabulary/UpdateVocabularyExecutor.java  |  3 +-
 .../UpdateVocabularyTermExecutor.java         |  3 +-
 ...pdateVocabularyTermsOperationExecutor.java |  3 +-
 .../VocabularyAuthorizationExecutor.java      |  3 +-
 .../VocabularyTermAuthorizationExecutor.java  |  3 +-
 .../AuthorizationGroupComparatorFactory.java  |  3 +-
 .../AuthorizationGroupQuery.java              |  3 +-
 .../ListAuthorizationGroupByPermId.java       |  3 +-
 .../ListAuthorizationGroupTechIdByPermId.java |  3 +-
 .../helper/common/AbstractListObjectById.java |  3 +-
 .../helper/common/AbstractListTechIdById.java |  3 +-
 .../common/AbstractListTechIdByPermId.java    |  3 +-
 .../asapi/v3/helper/common/CommonUtils.java   |  3 +-
 .../v3/helper/common/CreationIdCache.java     |  3 +-
 .../asapi/v3/helper/common/FreezingEvent.java |  3 +-
 .../asapi/v3/helper/common/FreezingFlags.java |  3 +-
 .../v3/helper/common/IListObjectById.java     |  3 +-
 .../asapi/v3/helper/common/MapObjectById.java |  3 +-
 .../common/TechIdStringIdentifierRecord.java  |  3 +-
 .../asapi/v3/helper/common/batch/Batch.java   |  3 +-
 .../helper/common/batch/CollectionBatch.java  |  3 +-
 .../batch/CollectionBatchProcessor.java       |  3 +-
 .../v3/helper/common/batch/MapBatch.java      |  3 +-
 .../common/batch/MapBatchProcessor.java       |  3 +-
 .../dataset/DataSetComparatorFactory.java     |  3 +-
 .../asapi/v3/helper/dataset/DataSetQuery.java |  3 +-
 .../helper/dataset/ListDataSetByPermId.java   |  3 +-
 .../dataset/ListDataSetTechIdByPermId.java    |  3 +-
 .../dataset/ListFileFormatTypeByPermId.java   |  3 +-
 .../dataset/ListLocatorTypeByPermId.java      |  3 +-
 .../datastore/ListDataStoreByPermId.java      |  3 +-
 .../helper/deletion/ListDeletionByTechId.java |  3 +-
 .../v3/helper/entity/EntityKindConverter.java |  3 +-
 .../v3/helper/entity/EntityTypeUtils.java     |  3 +-
 .../helper/entity/ListEntityTypeByPermId.java |  3 +-
 .../entity/progress/CheckAccessProgress.java  |  3 +-
 .../entity/progress/CheckDataProgress.java    |  3 +-
 .../entity/progress/CreateProgress.java       |  3 +-
 .../entity/progress/EntityProgress.java       |  3 +-
 .../entity/progress/SetRelationProgress.java  |  3 +-
 .../progress/UpdatePropertyProgress.java      |  3 +-
 .../progress/UpdateRelationProgress.java      |  3 +-
 .../entity/progress/VerifyProgress.java       |  3 +-
 .../ExperimentComparatorFactory.java          |  3 +-
 .../ExperimentContextDescription.java         |  3 +-
 .../ListExperimentByIdentifier.java           |  3 +-
 .../experiment/ListExperimentByPermId.java    |  3 +-
 .../helper/externaldms/ExternalDmsQuery.java  |  3 +-
 .../externaldms/ListExternalDmsByPermId.java  |  3 +-
 .../ListExternalDmsTechIdByPermId.java        |  3 +-
 .../helper/generators/AbstractGenerator.java  | 15 ++++
 .../v3/helper/generators/DtoGenerator.java    | 15 ++++
 .../asapi/v3/helper/generators/Generator.java | 15 ++++
 .../generators/UltimateJSEntityGenerator.java | 15 ++++
 .../uglify/ECMAScriptEngineFactory.java       | 15 ++++
 .../v3/helper/generators/uglify/UglifyJS.java | 15 ++++
 .../generators/uglify/UglifyOptions.java      | 15 ++++
 .../GlobalSearchObjectComparatorFactory.java  |  3 +-
 .../ObjectIdentifierComparator.java           |  3 +-
 .../globalsearch/ObjectKindComparator.java    |  3 +-
 .../globalsearch/ObjectPermIdComparator.java  |  3 +-
 .../helper/globalsearch/ScoreComparator.java  |  3 +-
 .../material/ListMaterialsByPermId.java       |  3 +-
 .../material/ListMaterialsTechIdByPermId.java |  3 +-
 .../material/MaterialComparatorFactory.java   |  3 +-
 .../v3/helper/material/MaterialQuery.java     |  3 +-
 .../pat/ListPersonalAccessTokenByPermId.java  |  3 +-
 .../v3/helper/person/ListPersonByMe.java      |  3 +-
 .../v3/helper/person/ListPersonByPermId.java  |  3 +-
 .../v3/helper/plugin/ListPluginByPermId.java  |  3 +-
 .../plugin/PluginComparatorFactory.java       |  3 +-
 .../project/ListProjectByIdentifier.java      |  3 +-
 .../helper/project/ListProjectByPermId.java   |  3 +-
 .../ListProjectTechIdByIdentifier.java        |  3 +-
 .../project/ListProjectTechIdByPermId.java    |  3 +-
 .../project/ProjectComparatorFactory.java     |  3 +-
 .../asapi/v3/helper/project/ProjectQuery.java |  3 +-
 .../v3/helper/property/IPropertyQuery.java    |  3 +-
 .../property/ListPropertyTypeByPermId.java    |  3 +-
 .../PropertyAssignmentComparatorFactory.java  |  3 +-
 .../PropertyTypeComparatorFactory.java        |  3 +-
 .../v3/helper/query/ListQueryByName.java      |  3 +-
 .../v3/helper/query/ListQueryByTechId.java    |  3 +-
 .../query/QueryDatabaseComparatorFactory.java |  3 +-
 .../ListRoleAssignmentPEByTechId.java         |  3 +-
 .../ListRoleAssignmentTechIdByTechId.java     |  3 +-
 .../roleassignment/RoleAssignmentQuery.java   |  3 +-
 .../roleassignment/RoleAssignmentUtils.java   |  3 +-
 .../helper/sample/FullSampleIdentifier.java   |  3 +-
 .../helper/sample/ListSampleByIdentifier.java |  3 +-
 .../v3/helper/sample/ListSampleByPermId.java  |  3 +-
 .../sample/ListSampleTechIdByIdentifier.java  |  3 +-
 .../sample/ListSampleTechIdByPermId.java      |  3 +-
 .../sample/SampleComparatorFactory.java       |  3 +-
 .../sample/SampleContextDescription.java      |  3 +-
 .../helper/sample/SampleIdentifierParts.java  |  3 +-
 .../asapi/v3/helper/sample/SampleQuery.java   |  3 +-
 .../asapi/v3/helper/sample/SampleUtils.java   |  3 +-
 .../ListSemanticAnnotationByPermId.java       |  3 +-
 .../ListSemanticAnnotationTechIdByPermId.java |  3 +-
 .../SemanticAnnotationQuery.java              |  3 +-
 .../CustomASServiceScriptRunnerFactory.java   |  3 +-
 .../helper/service/IScriptRunnerFactory.java  |  3 +-
 .../helper/service/IServiceScriptRunner.java  |  3 +-
 .../v3/helper/service/ImportService.java      |  3 +-
 .../JythonBasedCustomASServiceExecutor.java   |  4 +-
 .../v3/helper/sort/AbstractComparator.java    |  3 +-
 .../helper/sort/AbstractStringComparator.java |  3 +-
 .../asapi/v3/helper/sort/CodeComparator.java  |  3 +-
 .../v3/helper/sort/ComparatorFactory.java     |  3 +-
 .../v3/helper/sort/CompositeComparator.java   |  3 +-
 .../helper/sort/EntityComparatorFactory.java  |  3 +-
 ...EntityWithPropertiesComparatorFactory.java |  3 +-
 .../sort/FetchedFieldsScoreComparator.java    |  3 +-
 .../v3/helper/sort/IdentifierComparator.java  |  3 +-
 .../sort/ModificationDateComparator.java      |  3 +-
 .../v3/helper/sort/PermIdComparator.java      |  3 +-
 .../v3/helper/sort/PropertyComparator.java    |  3 +-
 .../sort/RegistrationDateComparator.java      |  3 +-
 .../asapi/v3/helper/sort/SortAndPage.java     |  3 +-
 .../asapi/v3/helper/sort/TypeComparator.java  |  3 +-
 .../v3/helper/space/ListSpaceByPermId.java    |  3 +-
 .../v3/helper/space/ListSpaceByTechId.java    |  3 +-
 .../helper/space/ListSpaceTechIdByPermId.java |  3 +-
 .../helper/space/SpaceComparatorFactory.java  |  3 +-
 .../asapi/v3/helper/space/SpaceQuery.java     |  3 +-
 .../asapi/v3/helper/tag/TagAuthorization.java |  3 +-
 .../v3/helper/tag/TagComparatorFactory.java   |  3 +-
 .../vocabulary/ListVocabularyByPermId.java    |  3 +-
 .../ListVocabularyTermByPermId.java           |  3 +-
 .../helper/vocabulary/OrdinalComparator.java  |  3 +-
 .../VocabularyComparatorFactory.java          |  3 +-
 .../VocabularyTermComparatorFactory.java      |  3 +-
 .../server/asapi/v3/search/PSQLTypes.java     |  3 +-
 .../search/auth/AuthorisationInformation.java |  3 +-
 ...QLAuthorisationInformationProviderDAO.java |  3 +-
 ...esAuthorisationInformationProviderDAO.java |  3 +-
 .../dao/IPropertyAssignmentSearchDAO.java     | 15 ++++
 .../asapi/v3/search/dao/ISQLSearchDAO.java    |  3 +-
 .../v3/search/dao/PostgresSearchDAO.java      |  3 +-
 .../dao/PropertyAssignmentSearchDAO.java      | 15 ++++
 .../v3/search/hibernate/IID2PEMapper.java     |  3 +-
 .../v3/search/hibernate/IdentityMapper.java   |  3 +-
 .../v3/search/mapper/AttributesMapper.java    |  3 +-
 .../v3/search/mapper/CriteriaMapper.java      |  3 +-
 .../asapi/v3/search/mapper/TableMapper.java   |  3 +-
 .../AbstractCompositeEntitySearchManager.java |  3 +-
 .../planner/AbstractLocalSearchManager.java   |  3 +-
 .../search/planner/AbstractSearchManager.java |  3 +-
 .../planner/ContentCopySearchManager.java     |  3 +-
 .../planner/DataSetKindSearchCriteria.java    |  3 +-
 .../search/planner/DataSetSearchManager.java  |  3 +-
 .../planner/DataSetTypeSearchManager.java     |  3 +-
 .../DummyCompositeSearchCriterion.java        |  3 +-
 .../planner/EntityTypeSearchManager.java      |  3 +-
 .../v3/search/planner/EventSearchManager.java |  3 +-
 .../planner/ExperimentSearchManager.java      |  3 +-
 .../planner/ExperimentTypeSearchManager.java  |  3 +-
 .../planner/ExternalDmsSearchManager.java     |  3 +-
 .../planner/FileFormatTypeSearchManager.java  |  3 +-
 .../search/planner/GlobalSearchManager.java   | 15 ++++
 .../planner/IFieldSearchCriterionFactory.java |  3 +-
 .../search/planner/IGlobalSearchManager.java  |  3 +-
 .../search/planner/ILocalSearchManager.java   |  3 +-
 .../v3/search/planner/ISearchManager.java     |  3 +-
 .../LinkedDataSetKindSearchManager.java       |  3 +-
 .../planner/LocatorTypeSearchManager.java     |  3 +-
 .../search/planner/MaterialSearchManager.java |  3 +-
 .../planner/MaterialTypeSearchManager.java    |  3 +-
 .../search/planner/PersonSearchManager.java   |  3 +-
 .../PhysicalDataSetKindSearchManager.java     |  3 +-
 .../search/planner/ProjectSearchManager.java  |  3 +-
 .../PropertyAssignmentSearchManager.java      |  3 +-
 .../planner/PropertyTypeSearchManager.java    |  3 +-
 .../planner/SampleContainerSearchManager.java |  3 +-
 .../search/planner/SampleSearchManager.java   |  3 +-
 .../planner/SampleTypeSearchManager.java      |  3 +-
 .../SemanticAnnotationSearchManager.java      |  3 +-
 .../v3/search/planner/SpaceSearchManager.java |  3 +-
 .../planner/StorageFormatSearchManager.java   |  3 +-
 .../v3/search/planner/TagSearchManager.java   |  3 +-
 .../v3/search/sql/AbstractSQLExecutor.java    |  3 +-
 .../v3/search/sql/HibernateSQLExecutor.java   |  3 +-
 .../asapi/v3/search/sql/ISQLExecutor.java     |  3 +-
 .../GlobalSearchCriteriaTranslator.java       | 15 ++++
 .../v3/search/translator/OrderTranslator.java |  3 +-
 .../v3/search/translator/SQLLexemes.java      |  3 +-
 .../translator/SearchCriteriaTranslator.java  |  3 +-
 .../v3/search/translator/SelectQuery.java     |  3 +-
 .../search/translator/TranslationContext.java |  3 +-
 .../condition/AbsenceConditionTranslator.java |  3 +-
 .../AnyFieldSearchConditionTranslator.java    |  3 +-
 .../AnyPropertySearchConditionTranslator.java |  3 +-
 ...BooleanFieldSearchConditionTranslator.java |  3 +-
 .../CodeSearchConditionTranslator.java        |  3 +-
 ...lectionFieldSearchConditionTranslator.java |  3 +-
 .../CompleteSearchConditionTranslator.java    |  3 +-
 ...RelationshipSearchConditionTranslator.java |  3 +-
 ...laryPropertySearchConditionTranslator.java |  3 +-
 .../DataSetKindSearchConditionTranslator.java |  3 +-
 .../DateFieldSearchConditionTranslator.java   |  3 +-
 .../EmailSearchConditionTranslator.java       |  3 +-
 .../EnumFieldSearchConditionTranslator.java   |  3 +-
 .../EventEntityTypeConditionTranslator.java   | 15 ++++
 .../FirstNameSearchConditionTranslator.java   |  3 +-
 .../translator/condition/IAliasFactory.java   |  3 +-
 .../condition/IConditionTranslator.java       |  3 +-
 .../IdSearchConditionTranslator.java          |  3 +-
 .../IdentifierSearchConditionTranslator.java  |  3 +-
 .../LastNameSearchConditionTranslator.java    |  3 +-
 ...leSampleTypeSearchConditionTranslator.java |  3 +-
 .../NameSearchConditionTranslator.java        |  3 +-
 .../NumberFieldSearchConditionTranslator.java |  3 +-
 ...mplePropertySearchConditionTranslator.java |  3 +-
 .../StringFieldSearchConditionTranslator.java |  3 +-
 .../TextAttributeConditionTranslator.java     |  3 +-
 .../UserIdSearchConditionTranslator.java      |  3 +-
 .../condition/utils/FullEntityIdentifier.java |  3 +-
 .../condition/utils/JoinInformation.java      |  3 +-
 .../translator/condition/utils/JoinType.java  |  3 +-
 .../condition/utils/TranslatorUtils.java      |  3 +-
 ...OperationExecutionMarkMaintenanceTask.java |  3 +-
 ...iledAfterServerRestartMaintenanceTask.java |  3 +-
 ...tionMarkTimeOutPendingMaintenanceTask.java |  3 +-
 ...nMarkTimedOutOrDeletedMaintenanceTask.java |  3 +-
 .../translator/AbstractCachingTranslator.java |  3 +-
 .../v3/translator/AbstractTranslator.java     |  3 +-
 .../asapi/v3/translator/ITranslator.java      |  3 +-
 .../asapi/v3/translator/NopTranslator.java    |  3 +-
 .../asapi/v3/translator/TranslationCache.java | 15 ++++
 .../v3/translator/TranslationContext.java     | 15 ++++
 .../v3/translator/TranslationResults.java     |  3 +-
 .../attachment/AttachmentBaseRecord.java      |  3 +-
 .../attachment/AttachmentBaseTranslator.java  |  3 +-
 .../attachment/AttachmentContentRecord.java   |  3 +-
 .../AttachmentContentTranslator.java          |  3 +-
 .../attachment/AttachmentQuery.java           |  3 +-
 .../AttachmentRegistratorTranslator.java      |  3 +-
 .../attachment/AttachmentTranslator.java      |  3 +-
 .../EntityAttachmentTranslator.java           |  3 +-
 .../attachment/IAttachmentBaseTranslator.java |  3 +-
 .../IAttachmentContentTranslator.java         |  3 +-
 .../IAttachmentRegistratorTranslator.java     |  3 +-
 .../attachment/IAttachmentTranslator.java     |  3 +-
 .../IEntityAttachmentTranslator.java          |  3 +-
 .../AuthorizationGroupBaseRecord.java         |  3 +-
 .../AuthorizationGroupBaseTranslator.java     |  3 +-
 .../AuthorizationGroupQuery.java              |  3 +-
 ...thorizationGroupRegistratorTranslator.java |  3 +-
 ...rizationGroupRoleAssignmentTranslator.java |  3 +-
 .../AuthorizationGroupTranslator.java         |  3 +-
 .../AuthorizationGroupUserTranslator.java     |  3 +-
 .../IAuthorizationGroupBaseTranslator.java    |  3 +-
 ...thorizationGroupRegistratorTranslator.java |  3 +-
 ...rizationGroupRoleAssignmentTranslator.java |  3 +-
 .../IAuthorizationGroupUserTranslator.java    |  3 +-
 ...IObjectToAuthorizationGroupTranslator.java |  3 +-
 .../ObjectToAuthorizationGroupTranslator.java |  3 +-
 .../AbstractAuthorizationValidator.java       |  3 +-
 .../common/IObjectAuthorizationValidator.java |  3 +-
 .../common/IObjectBaseTranslator.java         |  3 +-
 .../IObjectToManyRelationTranslator.java      |  3 +-
 .../IObjectToOneRelationTranslator.java       |  3 +-
 .../translator/common/ObjectBaseRecord.java   |  3 +-
 .../common/ObjectBaseTranslator.java          |  3 +-
 .../v3/translator/common/ObjectHolder.java    |  3 +-
 .../v3/translator/common/ObjectQuery.java     |  3 +-
 .../common/ObjectRelationRecord.java          |  3 +-
 .../ObjectToManyRelationTranslator.java       |  3 +-
 .../common/ObjectToOneRelationTranslator.java |  3 +-
 .../common/TableModelTranslator.java          |  3 +-
 ...ractCompositeSearchCriteriaTranslator.java |  3 +-
 .../AbstractEntityAttributeProvider.java      |  3 +-
 ...FromCompositeSearchCriteriaTranslator.java |  3 +-
 ...AbstractFieldSearchCriteriaTranslator.java |  3 +-
 .../AbstractSearchCriteriaTranslator.java     |  3 +-
 ...stractSearchCriteriaTranslatorFactory.java |  3 +-
 .../BooleanFieldSearchCriteriaTranslator.java |  3 +-
 .../CollectionSearchCriteriaTranslator.java   |  3 +-
 .../DateFieldSearchCriteriaTranslator.java    |  3 +-
 .../EntityTypeSearchCriteriaTranslator.java   |  3 +-
 .../EnumFieldSearchCriteriaTranslator.java    |  3 +-
 .../search/IObjectAttributeProvider.java      |  3 +-
 .../IObjectAttributeProviderFactory.java      |  3 +-
 .../search/ISearchCriteriaTranslator.java     |  3 +-
 .../NumberFieldSearchCriteriaTranslator.java  |  3 +-
 .../ObjectAttributeProviderFactory.java       |  3 +-
 .../SearchCriteriaTranslationResult.java      |  3 +-
 .../SearchCriteriaTranslatorFactory.java      |  3 +-
 .../common/search/SearchObjectKind.java       |  3 +-
 .../search/SearchTranslationContext.java      |  3 +-
 .../StringFieldSearchCriteriaTranslator.java  |  3 +-
 .../dataset/ContentCopyBaseTranslator.java    | 15 ++++
 .../ContentCopyExternalDmsTranslator.java     |  3 +-
 .../translator/dataset/ContentCopyRecord.java | 15 ++++
 .../dataset/ContentCopyTranslator.java        | 15 ++++
 .../DataSetAuthorizationValidator.java        |  3 +-
 .../translator/dataset/DataSetBaseRecord.java |  3 +-
 .../dataset/DataSetBaseTranslator.java        |  3 +-
 ...SetChildRelationshipHistoryTranslator.java |  3 +-
 .../dataset/DataSetChildTranslator.java       |  3 +-
 ...omponentRelationshipHistoryTranslator.java |  3 +-
 .../dataset/DataSetComponentsTranslator.java  |  3 +-
 ...ontainerRelationshipHistoryTranslator.java |  3 +-
 .../dataset/DataSetContainerTranslator.java   |  3 +-
 .../DataSetContentCopyHistoryTranslator.java  |  3 +-
 .../dataset/DataSetDataStoreTranslator.java   |  3 +-
 ...perimentRelationshipHistoryTranslator.java |  3 +-
 .../dataset/DataSetExperimentTranslator.java  |  3 +-
 .../dataset/DataSetHistoryTranslator.java     |  3 +-
 .../dataset/DataSetLinkedDataTranslator.java  |  3 +-
 .../DataSetMaterialPropertyTranslator.java    |  3 +-
 .../dataset/DataSetModifierTranslator.java    |  3 +-
 ...etParentRelationshipHistoryTranslator.java |  3 +-
 .../dataset/DataSetParentTranslator.java      |  3 +-
 .../DataSetPhysicalDataTranslator.java        |  3 +-
 .../DataSetPostRegisteredTranslator.java      |  3 +-
 .../DataSetPropertyAssignmentTranslator.java  |  3 +-
 .../DataSetPropertyHistoryTranslator.java     |  3 +-
 .../dataset/DataSetPropertyTranslator.java    |  3 +-
 .../v3/translator/dataset/DataSetQuery.java   |  3 +-
 .../dataset/DataSetRegistratorTranslator.java |  3 +-
 .../DataSetRelationshipHistoryTranslator.java |  3 +-
 .../dataset/DataSetRelationshipRecord.java    |  3 +-
 .../DataSetSamplePropertyTranslator.java      | 15 ++++
 ...etSampleRelationshipHistoryTranslator.java |  3 +-
 .../dataset/DataSetSampleTranslator.java      |  3 +-
 .../dataset/DataSetTagTranslator.java         |  3 +-
 .../translator/dataset/DataSetTranslator.java |  3 +-
 .../dataset/DataSetTypeBaseRecord.java        |  3 +-
 .../dataset/DataSetTypeBaseTranslator.java    |  3 +-
 .../DataSetTypeRelationTranslator.java        |  3 +-
 .../dataset/DataSetTypeTranslator.java        |  3 +-
 ...DataSetTypeValidationPluginTranslator.java |  3 +-
 ...tUnknownRelationshipHistoryTranslator.java |  3 +-
 .../dataset/FileFormatTypeBaseRecord.java     |  3 +-
 .../dataset/FileFormatTypeBaseTranslator.java |  3 +-
 .../dataset/FileFormatTypeTranslator.java     |  3 +-
 .../dataset/IContentCopyBaseTranslator.java   | 15 ++++
 .../IContentCopyExternalDmsTranslator.java    |  3 +-
 .../dataset/IContentCopyTranslator.java       | 15 ++++
 .../IDataSetAuthorizationValidator.java       |  3 +-
 .../dataset/IDataSetBaseTranslator.java       |  3 +-
 .../dataset/IDataSetChildTranslator.java      |  3 +-
 .../dataset/IDataSetComponentsTranslator.java |  3 +-
 .../dataset/IDataSetContainerTranslator.java  |  3 +-
 .../dataset/IDataSetDataStoreTranslator.java  |  3 +-
 .../dataset/IDataSetExperimentTranslator.java |  3 +-
 .../dataset/IDataSetHistoryTranslator.java    |  3 +-
 .../dataset/IDataSetLinkedDataTranslator.java |  3 +-
 .../IDataSetMaterialPropertyTranslator.java   |  3 +-
 .../dataset/IDataSetModifierTranslator.java   |  3 +-
 .../dataset/IDataSetParentTranslator.java     |  3 +-
 .../IDataSetPhysicalDataTranslator.java       |  3 +-
 .../IDataSetPostRegisteredTranslator.java     |  3 +-
 .../IDataSetPropertyAssignmentTranslator.java |  3 +-
 .../dataset/IDataSetPropertyTranslator.java   |  3 +-
 .../IDataSetRegistratorTranslator.java        |  3 +-
 .../IDataSetSamplePropertyTranslator.java     | 15 ++++
 .../dataset/IDataSetSampleTranslator.java     |  3 +-
 .../dataset/IDataSetTagTranslator.java        |  3 +-
 .../dataset/IDataSetTranslator.java           |  3 +-
 .../dataset/IDataSetTypeBaseTranslator.java   |  3 +-
 .../IDataSetTypeRelationTranslator.java       |  3 +-
 .../dataset/IDataSetTypeTranslator.java       |  3 +-
 ...DataSetTypeValidationPluginTranslator.java |  3 +-
 .../IFileFormatTypeBaseTranslator.java        |  3 +-
 .../dataset/IFileFormatTypeTranslator.java    |  3 +-
 .../dataset/ILinkedDataBaseTranslator.java    |  3 +-
 .../ILinkedDataContentCopiesTranslator.java   | 15 ++++
 .../dataset/ILinkedDataTranslator.java        |  3 +-
 .../dataset/ILocatorTypeBaseTranslator.java   |  3 +-
 .../dataset/ILocatorTypeTranslator.java       |  3 +-
 .../IObjectToContentCopiesTranslator.java     | 15 ++++
 .../dataset/IObjectToDataSetsTranslator.java  |  3 +-
 .../dataset/IPhysicalDataBaseTranslator.java  |  3 +-
 ...IPhysicalDataFileFormatTypeTranslator.java |  3 +-
 .../IPhysicalDataLocatorTypeTranslator.java   |  3 +-
 .../IPhysicalDataStorageFormatTranslator.java |  3 +-
 .../dataset/IPhysicalDataTranslator.java      |  3 +-
 .../dataset/LinkedDataBaseRecord.java         |  3 +-
 .../dataset/LinkedDataBaseTranslator.java     |  3 +-
 .../LinkedDataContentCopiesTranslator.java    | 15 ++++
 .../dataset/LinkedDataTranslator.java         |  3 +-
 .../dataset/LocatorTypeBaseRecord.java        |  3 +-
 .../dataset/LocatorTypeBaseTranslator.java    |  3 +-
 .../dataset/LocatorTypeTranslator.java        |  3 +-
 .../ObjectToContentCopiesTranslator.java      | 15 ++++
 .../dataset/ObjectToDataSetsTranslator.java   |  3 +-
 .../dataset/PhysicalDataBaseRecord.java       |  3 +-
 .../dataset/PhysicalDataBaseTranslator.java   |  3 +-
 .../PhysicalDataFileFormatTypeTranslator.java |  3 +-
 .../PhysicalDataLocatorTypeTranslator.java    |  3 +-
 .../PhysicalDataStorageFormatTranslator.java  |  3 +-
 .../dataset/PhysicalDataTranslator.java       |  3 +-
 .../CompleteSearchCriteriaTranslator.java     |  3 +-
 .../search/ContentCopyAttributeProvider.java  |  3 +-
 .../ContentCopySearchCriteriaTranslator.java  |  3 +-
 .../search/DataSetAttributeProvider.java      |  3 +-
 .../DataSetSearchCriteriaTranslator.java      |  3 +-
 .../FileFormatTypeAttributeProvider.java      |  3 +-
 ...ileFormatTypeSearchCriteriaTranslator.java |  3 +-
 .../search/LinkedDataAttributeProvider.java   |  3 +-
 .../LinkedDataSearchCriteriaTranslator.java   |  3 +-
 .../search/LocatorTypeAttributeProvider.java  |  3 +-
 .../LocatorTypeSearchCriteriaTranslator.java  |  3 +-
 .../search/PhysicalDataAttributeProvider.java |  3 +-
 .../PhysicalDataSearchCriteriaTranslator.java |  3 +-
 .../StatusSearchCriteriaTranslator.java       |  3 +-
 .../StorageFormatAttributeProvider.java       |  3 +-
 ...StorageFormatSearchCriteriaTranslator.java |  3 +-
 .../datastore/DataStoreBaseRecord.java        |  3 +-
 .../datastore/DataStoreBaseTranslator.java    |  3 +-
 .../translator/datastore/DataStoreQuery.java  |  3 +-
 .../datastore/DataStoreTranslator.java        |  3 +-
 .../datastore/IDataStoreBaseTranslator.java   |  3 +-
 .../datastore/IDataStoreTranslator.java       |  3 +-
 .../deletion/DeletionTranslator.java          |  3 +-
 .../deletion/IDeletionTranslator.java         |  3 +-
 .../v3/translator/event/EventBaseRecord.java  |  3 +-
 .../translator/event/EventBaseTranslator.java |  3 +-
 .../asapi/v3/translator/event/EventQuery.java |  3 +-
 .../event/EventRegistratorTranslator.java     |  3 +-
 .../v3/translator/event/EventTranslator.java  |  3 +-
 .../event/IEventBaseTranslator.java           |  3 +-
 .../event/IEventRegistratorTranslator.java    |  3 +-
 .../v3/translator/event/IEventTranslator.java |  3 +-
 .../ExperimentAttachmentTranslator.java       |  3 +-
 .../ExperimentAuthorizationValidator.java     |  3 +-
 .../experiment/ExperimentBaseRecord.java      |  3 +-
 .../experiment/ExperimentBaseTranslator.java  |  3 +-
 ...tDataSetRelationshipHistoryTranslator.java |  3 +-
 .../ExperimentDataSetTranslator.java          |  3 +-
 .../ExperimentHistoryTranslator.java          |  3 +-
 .../ExperimentMaterialPropertyTranslator.java |  3 +-
 .../ExperimentModifierTranslator.java         |  3 +-
 ...tProjectRelationshipHistoryTranslator.java |  3 +-
 .../ExperimentProjectTranslator.java          |  3 +-
 ...xperimentPropertyAssignmentTranslator.java |  3 +-
 .../ExperimentPropertyHistoryTranslator.java  |  3 +-
 .../ExperimentPropertyTranslator.java         |  3 +-
 .../experiment/ExperimentQuery.java           |  3 +-
 .../ExperimentRegistratorTranslator.java      |  3 +-
 ...perimentRelationshipHistoryTranslator.java |  3 +-
 .../ExperimentRelationshipRecord.java         |  3 +-
 .../ExperimentSamplePropertyTranslator.java   | 15 ++++
 ...ntSampleRelationshipHistoryTranslator.java |  3 +-
 .../ExperimentSampleTranslator.java           |  3 +-
 .../experiment/ExperimentTagTranslator.java   |  3 +-
 .../experiment/ExperimentTranslator.java      |  3 +-
 .../experiment/ExperimentTypeBaseRecord.java  |  3 +-
 .../ExperimentTypeBaseTranslator.java         |  3 +-
 .../ExperimentTypeRelationTranslator.java     |  3 +-
 .../experiment/ExperimentTypeTranslator.java  |  3 +-
 ...erimentTypeValidationPluginTranslator.java |  3 +-
 ...tUnknownRelationshipHistoryTranslator.java |  3 +-
 .../IExperimentAttachmentTranslator.java      |  3 +-
 .../IExperimentAuthorizationValidator.java    |  3 +-
 .../experiment/IExperimentBaseTranslator.java |  3 +-
 .../IExperimentDataSetTranslator.java         |  3 +-
 .../IExperimentHistoryTranslator.java         |  3 +-
 ...IExperimentMaterialPropertyTranslator.java |  3 +-
 .../IExperimentModifierTranslator.java        |  3 +-
 .../IExperimentProjectTranslator.java         |  3 +-
 ...xperimentPropertyAssignmentTranslator.java |  3 +-
 .../IExperimentPropertyTranslator.java        |  3 +-
 .../IExperimentRegistratorTranslator.java     |  3 +-
 .../IExperimentSamplePropertyTranslator.java  | 15 ++++
 .../IExperimentSampleTranslator.java          |  3 +-
 .../experiment/IExperimentTagTranslator.java  |  3 +-
 .../experiment/IExperimentTranslator.java     |  3 +-
 .../IExperimentTypeBaseTranslator.java        |  3 +-
 .../IExperimentTypeRelationTranslator.java    |  3 +-
 .../experiment/IExperimentTypeTranslator.java |  3 +-
 ...erimentTypeValidationPluginTranslator.java |  3 +-
 .../IObjectToExperimentTranslator.java        |  3 +-
 .../IObjectToExperimentsTranslator.java       |  3 +-
 .../ObjectToExperimentTranslator.java         |  3 +-
 .../ObjectToExperimentsTranslator.java        |  3 +-
 .../search/ExperimentAttributeProvider.java   |  3 +-
 .../ExperimentSearchCriteriaTranslator.java   |  3 +-
 .../externaldms/ExternalDmsBaseRecord.java    |  3 +-
 .../ExternalDmsBaseTranslator.java            |  3 +-
 .../externaldms/ExternalDmsQuery.java         |  3 +-
 .../externaldms/ExternalDmsTranslator.java    |  3 +-
 .../IExternalDmsBaseTranslator.java           |  3 +-
 .../externaldms/IExternalDmsTranslator.java   |  3 +-
 .../search/ExternalDmsAttributeProvider.java  |  3 +-
 .../ExternalDmsSearchCriteriaTranslator.java  |  3 +-
 .../GlobalSearchObjectTranslator.java         |  3 +-
 .../IGlobalSearchObjectTranslator.java        |  3 +-
 .../history/HistoryContentCopyRecord.java     |  3 +-
 .../history/HistoryPropertyRecord.java        |  3 +-
 .../v3/translator/history/HistoryRecord.java  |  3 +-
 .../history/HistoryRelationshipRecord.java    |  3 +-
 .../translator/history/HistoryTranslator.java |  3 +-
 .../history/IHistoryTranslator.java           |  3 +-
 .../history/PropertyHistoryTranslator.java    |  3 +-
 .../RelationshipHistoryTranslator.java        |  3 +-
 .../material/IMaterialBaseTranslator.java     |  3 +-
 .../material/IMaterialHistoryTranslator.java  |  3 +-
 .../IMaterialMaterialPropertyTranslator.java  |  3 +-
 ...IMaterialPropertyAssignmentTranslator.java |  3 +-
 .../material/IMaterialPropertyTranslator.java |  3 +-
 .../IMaterialRegistratorTranslator.java       |  3 +-
 .../material/IMaterialTagTranslator.java      |  3 +-
 .../material/IMaterialTranslator.java         |  3 +-
 .../material/IMaterialTypeBaseTranslator.java |  3 +-
 .../IMaterialTypeRelationTranslator.java      |  3 +-
 .../material/IMaterialTypeTranslator.java     |  3 +-
 ...aterialTypeValidationPluginTranslator.java |  3 +-
 .../IObjectToMaterialsTranslator.java         |  3 +-
 .../material/MaterialBaseRecord.java          |  3 +-
 .../material/MaterialBaseTranslator.java      |  3 +-
 .../material/MaterialHistoryTranslator.java   |  3 +-
 .../MaterialMaterialPropertyTranslator.java   |  3 +-
 .../MaterialPropertyAssignmentTranslator.java |  3 +-
 .../material/MaterialPropertyTranslator.java  |  3 +-
 .../v3/translator/material/MaterialQuery.java |  3 +-
 .../MaterialRegistratorTranslator.java        |  3 +-
 .../material/MaterialTagTranslator.java       |  3 +-
 .../material/MaterialTranslator.java          |  3 +-
 .../material/MaterialTypeBaseRecord.java      |  3 +-
 .../material/MaterialTypeBaseTranslator.java  |  3 +-
 .../MaterialTypeRelationTranslator.java       |  3 +-
 .../material/MaterialTypeTranslator.java      |  3 +-
 ...aterialTypeValidationPluginTranslator.java |  3 +-
 .../material/ObjectToMaterialsTranslator.java |  3 +-
 .../search/MaterialAttributeProvider.java     |  3 +-
 .../MaterialSearchCriteriaTranslator.java     |  3 +-
 .../pat/IPersonalAccessTokenTranslator.java   |  3 +-
 .../pat/PersonalAccessTokenTranslator.java    |  3 +-
 .../person/IObjectToPersonTranslator.java     |  3 +-
 .../person/IPersonBaseTranslator.java         |  3 +-
 .../person/IPersonRegistratorTranslator.java  |  3 +-
 .../IPersonRoleAssignmentTranslator.java      |  3 +-
 .../person/IPersonSpaceTranslator.java        |  3 +-
 .../translator/person/IPersonTranslator.java  |  3 +-
 .../IPersonWebAppSettingsTranslator.java      |  3 +-
 .../person/ObjectToPersonTranslator.java      |  3 +-
 .../translator/person/PersonBaseRecord.java   |  3 +-
 .../person/PersonBaseTranslator.java          |  3 +-
 .../v3/translator/person/PersonQuery.java     |  3 +-
 .../person/PersonRegistratorTranslator.java   |  3 +-
 .../PersonRoleAssignmentTranslator.java       |  3 +-
 .../person/PersonSpaceTranslator.java         |  3 +-
 .../translator/person/PersonTranslator.java   |  3 +-
 .../PersonWebAppSettingsTranslator.java       |  3 +-
 .../ModifierSearchCriteriaTranslator.java     |  3 +-
 .../PersonSearchCriteriaTranslator.java       |  3 +-
 .../RegistratorSearchCriteriaTranslator.java  |  3 +-
 .../plugin/IObjectToPluginTranslator.java     |  3 +-
 .../plugin/IPluginBaseTranslator.java         |  3 +-
 .../plugin/IPluginRegistratorTranslator.java  |  3 +-
 .../translator/plugin/IPluginTranslator.java  |  3 +-
 .../plugin/ObjectToPluginTranslator.java      |  3 +-
 .../plugin/PluginBaseTranslator.java          |  3 +-
 .../v3/translator/plugin/PluginQuery.java     |  3 +-
 .../v3/translator/plugin/PluginRecord.java    |  3 +-
 .../plugin/PluginRegistratorTranslator.java   |  3 +-
 .../translator/plugin/PluginTranslator.java   |  3 +-
 .../project/IObjectToProjectTranslator.java   |  3 +-
 .../project/IObjectToProjectsTranslator.java  |  3 +-
 .../project/IProjectAttachmentTranslator.java |  3 +-
 .../IProjectAuthorizationValidator.java       |  3 +-
 .../project/IProjectBaseTranslator.java       |  3 +-
 .../project/IProjectExperimentTranslator.java |  3 +-
 .../project/IProjectHistoryTranslator.java    |  3 +-
 .../project/IProjectLeaderTranslator.java     |  3 +-
 .../project/IProjectModifierTranslator.java   |  3 +-
 .../IProjectRegistratorTranslator.java        |  3 +-
 .../project/IProjectSampleTranslator.java     |  3 +-
 .../project/IProjectSpaceTranslator.java      |  3 +-
 .../project/IProjectTranslator.java           |  3 +-
 .../project/ObjectToProjectTranslator.java    |  3 +-
 .../project/ObjectToProjectsTranslator.java   |  3 +-
 .../project/ProjectAttachmentTranslator.java  |  3 +-
 .../project/ProjectAuthorizationRecord.java   |  3 +-
 .../ProjectAuthorizationValidator.java        |  3 +-
 .../translator/project/ProjectBaseRecord.java |  3 +-
 .../project/ProjectBaseTranslator.java        |  3 +-
 ...perimentRelationshipHistoryTranslator.java |  3 +-
 .../project/ProjectExperimentTranslator.java  |  3 +-
 .../project/ProjectHistoryTranslator.java     |  3 +-
 .../project/ProjectLeaderTranslator.java      |  3 +-
 .../project/ProjectModifierTranslator.java    |  3 +-
 .../v3/translator/project/ProjectQuery.java   |  3 +-
 .../project/ProjectRegistratorTranslator.java |  3 +-
 .../ProjectRelationshipHistoryTranslator.java |  3 +-
 .../project/ProjectRelationshipRecord.java    |  3 +-
 ...ctSampleRelationshipHistoryTranslator.java |  3 +-
 .../project/ProjectSampleTranslator.java      |  3 +-
 ...ectSpaceRelationshipHistoryTranslator.java |  3 +-
 .../project/ProjectSpaceTranslator.java       |  3 +-
 .../translator/project/ProjectTranslator.java |  3 +-
 ...tUnknownRelationshipHistoryTranslator.java |  3 +-
 .../ProjectSearchCriteriaTranslator.java      |  3 +-
 .../property/IMaterialPropertyTranslator.java |  3 +-
 .../IPropertyAssignmentTranslator.java        |  3 +-
 .../property/IPropertyTranslator.java         |  3 +-
 .../property/IPropertyTypeBaseTranslator.java |  3 +-
 .../IPropertyTypeMaterialTypeTranslator.java  |  3 +-
 .../IPropertyTypeRegistratorTranslator.java   |  3 +-
 .../IPropertyTypeSampleTypeTranslator.java    | 15 ++++
 ...pertyTypeSemanticAnnotationTranslator.java |  3 +-
 .../property/IPropertyTypeTranslator.java     |  3 +-
 .../IPropertyTypeVocabularyTranslator.java    |  3 +-
 .../property/ISamplePropertyTranslator.java   | 15 ++++
 .../property/MaterialPropertyRecord.java      |  3 +-
 .../property/MaterialPropertyTranslator.java  |  3 +-
 .../property/PropertyAssignmentKey.java       |  3 +-
 .../property/PropertyAssignmentRecord.java    |  3 +-
 .../PropertyAssignmentTranslator.java         |  3 +-
 .../property/PropertyQueryGenerator.java      |  3 +-
 .../translator/property/PropertyRecord.java   |  3 +-
 .../property/PropertyTranslator.java          |  3 +-
 .../property/PropertyTypeBaseTranslator.java  |  3 +-
 .../PropertyTypeMaterialTypeTranslator.java   |  3 +-
 .../property/PropertyTypeQuery.java           |  3 +-
 .../property/PropertyTypeRecord.java          |  3 +-
 .../PropertyTypeRegistratorTranslator.java    |  3 +-
 .../PropertyTypeSampleTypeTranslator.java     | 15 ++++
 ...pertyTypeSemanticAnnotationTranslator.java |  3 +-
 .../property/PropertyTypeTranslator.java      |  3 +-
 .../PropertyTypeVocabularyTranslator.java     |  3 +-
 .../property/SamplePropertyRecord.java        | 15 ++++
 .../property/SamplePropertyTranslator.java    | 15 ++++
 .../query/IQueryAuthorizationValidator.java   |  3 +-
 .../query/IQueryBaseTranslator.java           |  3 +-
 .../query/IQueryDatabaseTranslator.java       |  3 +-
 .../query/IQueryRegistratorTranslator.java    |  3 +-
 .../v3/translator/query/IQueryTranslator.java |  3 +-
 .../query/QueryAuthorizationRecord.java       |  3 +-
 .../query/QueryAuthorizationValidator.java    |  3 +-
 .../v3/translator/query/QueryBaseRecord.java  |  3 +-
 .../translator/query/QueryBaseTranslator.java |  3 +-
 .../query/QueryDatabaseTranslator.java        |  3 +-
 .../asapi/v3/translator/query/QueryQuery.java |  3 +-
 .../query/QueryRegistratorTranslator.java     |  3 +-
 .../v3/translator/query/QueryTranslator.java  |  3 +-
 ...ssignmentAuthorizationGroupTranslator.java |  3 +-
 .../IRoleAssignmentBaseTranslator.java        |  3 +-
 .../IRoleAssignmentPersonTranslator.java      |  3 +-
 .../IRoleAssignmentProjectTranslator.java     |  3 +-
 .../IRoleAssignmentRegistratorTranslator.java |  3 +-
 .../IRoleAssignmentSpaceTranslator.java       |  3 +-
 .../IRoleAssignmentTranslator.java            |  3 +-
 ...ssignmentAuthorizationGroupTranslator.java |  3 +-
 .../RoleAssignmentBaseRecord.java             |  3 +-
 .../RoleAssignmentBaseTranslator.java         |  3 +-
 .../RoleAssignmentPersonTranslator.java       |  3 +-
 .../RoleAssignmentProjectTranslator.java      |  3 +-
 .../roleassignment/RoleAssignmentQuery.java   |  3 +-
 .../RoleAssignmentRegistratorTranslator.java  |  3 +-
 .../RoleAssignmentSpaceTranslator.java        |  3 +-
 .../RoleAssignmentTranslator.java             |  3 +-
 .../sample/IObjectToSampleTranslator.java     |  3 +-
 .../sample/IObjectToSamplesTranslator.java    |  3 +-
 .../sample/ISampleAttachmentTranslator.java   |  3 +-
 .../sample/ISampleAuthorizationValidator.java |  3 +-
 .../sample/ISampleBaseTranslator.java         |  3 +-
 .../sample/ISampleChildTranslator.java        |  3 +-
 .../sample/ISampleComponentsTranslator.java   |  3 +-
 .../sample/ISampleContainerTranslator.java    |  3 +-
 .../sample/ISampleDataSetTranslator.java      |  3 +-
 .../sample/ISampleExperimentTranslator.java   |  3 +-
 .../sample/ISampleHistoryTranslator.java      |  3 +-
 .../ISampleMaterialPropertyTranslator.java    |  3 +-
 .../sample/ISampleModifierTranslator.java     |  3 +-
 .../sample/ISampleParentTranslator.java       |  3 +-
 .../sample/ISampleProjectTranslator.java      |  3 +-
 .../ISamplePropertyAssignmentTranslator.java  |  3 +-
 .../sample/ISamplePropertyTranslator.java     |  3 +-
 .../sample/ISampleRegistratorTranslator.java  |  3 +-
 .../ISampleSamplePropertyTranslator.java      | 15 ++++
 .../sample/ISampleSpaceTranslator.java        |  3 +-
 .../sample/ISampleTagTranslator.java          |  3 +-
 .../translator/sample/ISampleTranslator.java  |  3 +-
 .../sample/ISampleTypeBaseTranslator.java     |  3 +-
 .../sample/ISampleTypeRelationTranslator.java |  3 +-
 ...ampleTypeSemanticAnnotationTranslator.java |  3 +-
 .../sample/ISampleTypeTranslator.java         |  3 +-
 ...ISampleTypeValidationPluginTranslator.java |  3 +-
 .../sample/ObjectToSampleTranslator.java      |  3 +-
 .../sample/ObjectToSamplesTranslator.java     |  3 +-
 .../sample/SampleAttachmentTranslator.java    |  3 +-
 .../sample/SampleAuthorizationValidator.java  |  3 +-
 .../translator/sample/SampleBaseRecord.java   |  3 +-
 .../sample/SampleBaseTranslator.java          |  3 +-
 ...pleChildRelationshipHistoryTranslator.java |  3 +-
 .../sample/SampleChildTranslator.java         |  3 +-
 ...omponentRelationshipHistoryTranslator.java |  3 +-
 .../sample/SampleComponentsTranslator.java    |  3 +-
 ...ontainerRelationshipHistoryTranslator.java |  3 +-
 .../sample/SampleContainerTranslator.java     |  3 +-
 ...eDataSetRelationshipHistoryTranslator.java |  3 +-
 .../sample/SampleDataSetTranslator.java       |  3 +-
 ...perimentRelationshipHistoryTranslator.java |  3 +-
 .../sample/SampleExperimentTranslator.java    |  3 +-
 .../sample/SampleHistoryTranslator.java       |  3 +-
 .../SampleMaterialPropertyTranslator.java     |  3 +-
 .../sample/SampleModifierTranslator.java      |  3 +-
 ...leParentRelationshipHistoryTranslator.java |  3 +-
 .../sample/SampleParentTranslator.java        |  3 +-
 ...eProjectRelationshipHistoryTranslator.java |  3 +-
 .../sample/SampleProjectTranslator.java       |  3 +-
 .../SamplePropertyAssignmentTranslator.java   |  3 +-
 .../SamplePropertyHistoryTranslator.java      |  3 +-
 .../sample/SamplePropertyTranslator.java      |  3 +-
 .../v3/translator/sample/SampleQuery.java     |  3 +-
 .../sample/SampleRegistratorTranslator.java   |  3 +-
 .../SampleRelationshipHistoryTranslator.java  |  3 +-
 .../sample/SampleRelationshipRecord.java      |  3 +-
 .../SampleSamplePropertyTranslator.java       | 15 ++++
 ...pleSpaceRelationshipHistoryTranslator.java |  3 +-
 .../sample/SampleSpaceTranslator.java         |  3 +-
 .../sample/SampleTagTranslator.java           |  3 +-
 .../translator/sample/SampleTranslator.java   |  3 +-
 .../sample/SampleTypeBaseRecord.java          |  3 +-
 .../sample/SampleTypeBaseTranslator.java      |  3 +-
 .../sample/SampleTypeRelationTranslator.java  |  3 +-
 ...ampleTypeSemanticAnnotationTranslator.java |  3 +-
 .../sample/SampleTypeTranslator.java          |  3 +-
 .../SampleTypeValidationPluginTranslator.java |  3 +-
 ...eUnknownRelationshipHistoryTranslator.java |  3 +-
 .../sample/SampleWithAnnotations.java         |  3 +-
 .../search/SampleAttributeProvider.java       |  3 +-
 .../SampleSearchCriteriaTranslator.java       |  3 +-
 .../ISemanticAnnotationBaseTranslator.java    |  3 +-
 ...emanticAnnotationEntityTypeTranslator.java |  3 +-
 ...nnotationPropertyAssignmentTranslator.java |  3 +-
 ...anticAnnotationPropertyTypeTranslator.java |  3 +-
 .../ISemanticAnnotationTranslator.java        |  3 +-
 .../SemanticAnnotationBaseRecord.java         |  3 +-
 .../SemanticAnnotationBaseTranslator.java     |  3 +-
 ...emanticAnnotationEntityTypeTranslator.java |  3 +-
 ...nnotationPropertyAssignmentTranslator.java |  3 +-
 ...anticAnnotationPropertyTypeTranslator.java |  3 +-
 .../SemanticAnnotationQuery.java              |  3 +-
 .../SemanticAnnotationTranslator.java         |  3 +-
 .../ISearchDomainResultTranslator.java        |  3 +-
 .../ISessionInformationTranslator.java        |  3 +-
 .../session/SessionInformationTranslator.java |  3 +-
 .../space/IObjectToSpaceTranslator.java       |  3 +-
 .../space/ISpaceAuthorizationValidator.java   |  3 +-
 .../space/ISpaceBaseTranslator.java           |  3 +-
 .../space/ISpaceProjectTranslator.java        |  3 +-
 .../space/ISpaceRegistratorTranslator.java    |  3 +-
 .../space/ISpaceSampleTranslator.java         |  3 +-
 .../v3/translator/space/ISpaceTranslator.java |  3 +-
 .../space/ObjectToSpaceTranslator.java        |  3 +-
 .../space/SpaceAuthorizationRecord.java       |  3 +-
 .../space/SpaceAuthorizationValidator.java    |  3 +-
 .../v3/translator/space/SpaceBaseRecord.java  |  3 +-
 .../translator/space/SpaceBaseTranslator.java |  3 +-
 .../space/SpaceProjectTranslator.java         |  3 +-
 .../asapi/v3/translator/space/SpaceQuery.java |  3 +-
 .../space/SpaceRegistratorTranslator.java     |  3 +-
 .../space/SpaceSampleTranslator.java          |  3 +-
 .../v3/translator/space/SpaceTranslator.java  |  3 +-
 .../search/SpaceSearchCriteriaTranslator.java |  3 +-
 .../tag/IObjectToTagsTranslator.java          |  3 +-
 .../tag/ITagAuthorizationValidator.java       |  3 +-
 .../v3/translator/tag/ITagBaseTranslator.java |  3 +-
 .../translator/tag/ITagDataSetTranslator.java |  3 +-
 .../tag/ITagExperimentTranslator.java         |  3 +-
 .../tag/ITagMaterialTranslator.java           |  3 +-
 .../translator/tag/ITagOwnerTranslator.java   |  3 +-
 .../translator/tag/ITagSampleTranslator.java  |  3 +-
 .../v3/translator/tag/ITagTranslator.java     |  3 +-
 .../tag/ObjectToTagsTranslator.java           |  3 +-
 .../tag/TagAuthorizationRecord.java           |  3 +-
 .../tag/TagAuthorizationValidator.java        |  3 +-
 .../v3/translator/tag/TagBaseRecord.java      |  3 +-
 .../v3/translator/tag/TagBaseTranslator.java  |  3 +-
 .../translator/tag/TagDataSetTranslator.java  |  3 +-
 .../tag/TagExperimentTranslator.java          |  3 +-
 .../translator/tag/TagMaterialTranslator.java |  3 +-
 .../v3/translator/tag/TagOwnerTranslator.java |  3 +-
 .../asapi/v3/translator/tag/TagQuery.java     |  3 +-
 .../translator/tag/TagSampleTranslator.java   |  3 +-
 .../v3/translator/tag/TagTranslator.java      |  3 +-
 .../search/TagSearchCriteriaTranslator.java   |  3 +-
 .../vocabulary/IVocabularyBaseTranslator.java |  3 +-
 .../IVocabularyRegistratorTranslator.java     |  3 +-
 .../IVocabularyTermBaseTranslator.java        |  3 +-
 .../IVocabularyTermRegistratorTranslator.java |  3 +-
 .../vocabulary/IVocabularyTermTranslator.java |  3 +-
 .../IVocabularyTermVocabularyTranslator.java  |  3 +-
 .../vocabulary/IVocabularyTranslator.java     |  3 +-
 .../IVocabularyVocabularyTermTranslator.java  |  3 +-
 .../vocabulary/VocabularyBaseRecord.java      |  3 +-
 .../vocabulary/VocabularyBaseTranslator.java  |  3 +-
 .../vocabulary/VocabularyQuery.java           |  3 +-
 .../VocabularyRegistratorTranslator.java      |  3 +-
 .../vocabulary/VocabularyTermBaseRecord.java  |  3 +-
 .../VocabularyTermBaseTranslator.java         |  3 +-
 .../VocabularyTermRegistratorTranslator.java  |  3 +-
 .../vocabulary/VocabularyTermTranslator.java  |  3 +-
 .../VocabularyTermVocabularyTranslator.java   |  3 +-
 .../vocabulary/VocabularyTranslator.java      |  3 +-
 .../VocabularyVocabularyTermTranslator.java   |  3 +-
 .../server/asapi/v3/utils/EntityUtils.java    |  3 +-
 .../server/asapi/v3/utils/ExceptionUtils.java |  2 +-
 ...ptyJsonClassValueToClassObjectMapping.java |  3 +-
 .../v3/json/GenericObjectMapper.java          |  3 +-
 .../json/JsonBaseTypeToSubTypesMapping.java   |  3 +-
 .../v3/json/ObjectMapperResource.java         |  3 +-
 .../xls/export/ExportHelperFactory.java       | 15 ++++
 .../server/xls/export/ExportableKind.java     | 15 ++++
 .../server/xls/export/ExportablePermId.java   | 15 ++++
 .../generic/server/xls/export/XLSExport.java  | 15 ++++
 .../helper/AbstractXLSExportHelper.java       | 15 ++++
 .../xls/export/helper/IXLSExportHelper.java   | 15 ++++
 .../export/helper/XLSDataSetExportHelper.java | 15 ++++
 .../helper/XLSDataSetTypeExportHelper.java    | 15 ++++
 .../helper/XLSExperimentExportHelper.java     | 15 ++++
 .../helper/XLSExperimentTypeExportHelper.java | 15 ++++
 .../export/helper/XLSProjectExportHelper.java | 15 ++++
 .../export/helper/XLSSampleExportHelper.java  | 15 ++++
 .../helper/XLSSampleTypeExportHelper.java     | 15 ++++
 .../export/helper/XLSSpaceExportHelper.java   | 15 ++++
 .../helper/XLSVocabularyExportHelper.java     | 15 ++++
 .../server/xls/importer/ImportOptions.java    | 15 ++++
 .../xls/importer/MainImportXlsTest.java       | 15 ++++
 .../server/xls/importer/XLSImport.java        | 15 ++++
 .../xls/importer/delay/DelayedExecution.java  | 15 ++++
 .../delay/DelayedExecutionDecorator.java      | 15 ++++
 .../importer/delay/IdentifierVariable.java    | 15 ++++
 .../xls/importer/enums/ImportModes.java       | 15 ++++
 .../xls/importer/enums/ImportTypes.java       | 15 ++++
 .../xls/importer/enums/ScriptTypes.java       | 15 ++++
 .../xls/importer/handler/ExcelParser.java     | 15 ++++
 .../xls/importer/handler/JSONHandler.java     | 15 ++++
 .../importer/handler/VersionInfoHandler.java  | 15 ++++
 .../importer/helper/AbstractImportHelper.java | 15 ++++
 .../importer/helper/BasicImportHelper.java    | 15 ++++
 .../helper/DatasetTypeImportHelper.java       | 15 ++++
 .../helper/ExperimentImportHelper.java        | 15 ++++
 .../helper/ExperimentTypeImportHelper.java    | 15 ++++
 .../importer/helper/ProjectImportHelper.java  | 15 ++++
 .../PropertyAssignmentImportHelper.java       | 15 ++++
 .../helper/PropertyTypeImportHelper.java      | 15 ++++
 .../importer/helper/SampleImportHelper.java   | 15 ++++
 .../helper/SampleTypeImportHelper.java        | 15 ++++
 .../importer/helper/ScriptImportHelper.java   | 15 ++++
 .../SemanticAnnotationImportHelper.java       | 15 ++++
 .../importer/helper/SpaceImportHelper.java    | 15 ++++
 .../helper/VocabularyImportHelper.java        | 15 ++++
 .../helper/VocabularyTermImportHelper.java    | 15 ++++
 ...pplicationServerSemanticAPIExtensions.java | 15 ++++
 .../importer/utils/AttributeValidator.java    | 15 ++++
 .../utils/DatabaseConsistencyChecker.java     | 15 ++++
 .../server/xls/importer/utils/IAttribute.java | 15 ++++
 .../xls/importer/utils/ImportUtils.java       | 15 ++++
 .../importer/utils/PropertyTypeSearcher.java  | 15 ++++
 .../xls/importer/utils/VersionUtils.java      | 15 ++++
 .../generic/shared/utils/AutoSymlink.java     |  3 +-
 .../cisd/openbis/BuildAndEnvironmentInfo.java |  3 +-
 .../AbstractWebStartClientServingServlet.java |  3 +-
 .../DataSetUploadClientServingServlet.java    |  3 +-
 .../generic/client/cli/DataSetLister.java     |  3 +-
 .../openbis/generic/client/cli/Login.java     |  3 +-
 .../console/AbstractRegisterEntityType.java   |  3 +-
 .../generic/client/console/AdminConsole.java  |  3 +-
 .../generic/client/console/Assignment.java    |  3 +-
 .../client/console/AttributeSetter.java       | 15 ++++
 .../generic/client/console/ICommand.java      |  3 +-
 .../openbis/generic/client/console/Lexer.java |  3 +-
 .../client/console/RegisterDataSetType.java   |  3 +-
 .../console/RegisterExperimentType.java       |  3 +-
 .../client/console/RegisterMaterialType.java  |  3 +-
 .../client/console/RegisterPropertyType.java  |  3 +-
 .../client/console/RegisterSampleType.java    |  3 +-
 .../generic/client/console/RegisterType.java  |  3 +-
 .../generic/client/console/ScriptContext.java |  3 +-
 .../openbis/generic/client/console/Set.java   |  3 +-
 .../client/web/client/IClientService.java     |  3 +-
 .../web/client/IClientServiceAsync.java       |  3 +-
 .../web/client/ICommonClientService.java      |  3 +-
 .../web/client/ICommonClientServiceAsync.java |  3 +-
 .../IOnlineHelpResourceLocatorService.java    |  3 +-
 .../application/AbstractAsyncCallback.java    |  3 +-
 .../AbstractClientPluginFactory.java          |  3 +-
 .../AbstractPluginViewContext.java            |  3 +-
 .../web/client/application/ActionContext.java |  3 +-
 .../AsyncCallbackWithProgressBar.java         |  3 +-
 .../AttachmentVersionsSection.java            |  3 +-
 .../application/CallbackListenerAdapter.java  |  3 +-
 .../client/web/client/application/Client.java |  3 +-
 .../client/application/CommonViewContext.java |  3 +-
 .../client/web/client/application/Dict.java   |  3 +-
 .../application/DisposableTabContent.java     |  3 +-
 .../client/application/FormPanelListener.java |  3 +-
 .../client/application/GenericViewModel.java  |  3 +-
 .../GlobalSearchTabItemFactory.java           |  3 +-
 .../client/application/ICallbackListener.java |  3 +-
 .../application/IGenericImageBundle.java      |  3 +-
 .../client/application/IOnSuccessAction.java  |  3 +-
 .../client/application/IPageController.java   |  3 +-
 .../web/client/application/IViewContext.java  |  3 +-
 .../application/InfoBoxCallbackListener.java  |  3 +-
 .../application/ManagedPropertySection.java   |  3 +-
 .../application/MatchingEntitiesPanel.java    |  3 +-
 .../application/ProjectPropertiesPanel.java   |  3 +-
 .../web/client/application/ProjectViewer.java |  3 +-
 .../web/client/application/SearchWidget.java  |  3 +-
 .../SearchableEntitySelectionWidget.java      |  3 +-
 .../ShowRelatedDatasetsDialog.java            |  3 +-
 .../application/ShowResultSetCutInfo.java     |  3 +-
 .../web/client/application/TabContent.java    |  3 +-
 .../client/application/UrlParamsHelper.java   |  3 +-
 .../client/application/VoidAsyncCallback.java |  3 +-
 ...abaseModificationObserverWithCallback.java |  3 +-
 .../framework/AbstractTabItemFactory.java     |  3 +-
 .../application/framework/AppController.java  |  3 +-
 .../application/framework/AppEvents.java      |  3 +-
 .../client/application/framework/AppView.java |  3 +-
 .../framework/ComponentProvider.java          |  3 +-
 .../ComponentWithCloseConfirmationUtil.java   |  3 +-
 ...CompositeDatabaseModificationObserver.java |  3 +-
 ...eModificationObserverWithMainObserver.java |  3 +-
 .../DatabaseModificationAwareComponent.java   |  3 +-
 .../DatabaseModificationAwareField.java       |  3 +-
 .../DatabaseModificationAwareObject.java      |  3 +-
 .../DatabaseModificationAwareWidget.java      |  3 +-
 .../framework/DebugPanelManager.java          |  3 +-
 .../application/framework/DefaultTabItem.java |  3 +-
 .../framework/DispatcherHelper.java           |  3 +-
 .../framework/DisplaySettingsManager.java     |  3 +-
 .../framework/DisplayTypeIDGenerator.java     |  4 +-
 .../application/framework/DummyComponent.java |  3 +-
 .../application/framework/HtmlPage.java       |  3 +-
 .../application/framework/IClosableItem.java  |  3 +-
 .../IComponentWithCloseConfirmation.java      |  3 +-
 .../framework/IComponentWithRefresh.java      |  3 +-
 .../IDatabaseModificationObserver.java        |  3 +-
 ...abaseModificationObserverWithCallback.java |  3 +-
 .../framework/IDisplaySettingsGetter.java     |  3 +-
 .../framework/IDisplayTypeIDGenerator.java    |  3 +-
 .../application/framework/IMainPanel.java     |  3 +-
 .../application/framework/ITabItem.java       |  3 +-
 .../framework/LastHistoryTokenUpdater.java    |  3 +-
 .../LastModificationStateUpdater.java         |  3 +-
 .../framework/LoginController.java            |  3 +-
 .../application/framework/LoginPage.java      |  3 +-
 .../application/framework/LoginView.java      |  3 +-
 .../application/framework/MainPagePanel.java  |  3 +-
 .../application/framework/MainTabPanel.java   |  3 +-
 .../framework/SampleTypeDisplayID.java        |  3 +-
 .../framework/TabTitleUpdater.java            | 15 ++++
 .../framework/WelcomePanelHelper.java         |  3 +-
 .../application/help/HelpPageIdentifier.java  |  3 +-
 .../locator/AbstractViewLocatorResolver.java  | 15 ++++
 .../AttachmentDownloadLocatorResolver.java    | 15 ++++
 .../locator/BrowserLocatorResolver.java       | 15 ++++
 .../locator/CustomImportLocatorResolver.java  | 15 ++++
 .../locator/DataSetSearchLocatorResolver.java |  3 +-
 .../locator/GlobalSearchLocatorResolver.java  | 15 ++++
 .../locator/HomeLocatorResolver.java          | 15 ++++
 .../locator/IViewLocatorResolver.java         |  3 +-
 .../locator/MaterialCodeUtils.java            |  3 +-
 .../locator/MaterialLocatorResolver.java      | 15 ++++
 .../MetaprojectBrowserLocatorResolver.java    | 15 ++++
 .../locator/MetaprojectLocatorResolver.java   | 15 ++++
 .../application/locator/OpenViewAction.java   |  3 +-
 .../PermlinkEditingLocatorResolver.java       |  3 +-
 .../locator/PermlinkLocatorResolver.java      | 15 ++++
 .../locator/ProjectLocatorResolver.java       | 15 ++++
 .../SampleRegistrationLocatorResolver.java    |  3 +-
 .../locator/SampleSearchLocatorResolver.java  |  3 +-
 .../locator/SearchLocatorResolver.java        | 15 ++++
 .../application/locator/ViewLocator.java      |  3 +-
 .../locator/ViewLocatorResolverRegistry.java  |  3 +-
 .../application/menu/AbstractActionMenu.java  |  3 +-
 .../client/application/menu/ActionMenu.java   |  3 +-
 .../application/menu/IActionMenuItem.java     |  3 +-
 .../menu/ITabActionMenuItemDefinition.java    |  3 +-
 .../client/application/menu/InfoButton.java   | 15 ++++
 .../menu/TabActionMenuItemFactory.java        |  3 +-
 .../web/client/application/menu/TopMenu.java  |  3 +-
 .../client/application/menu/TopMenuItem.java  |  3 +-
 .../client/application/menu/TrashButton.java  | 15 ++++
 .../ActiveUsersCountAction.java               |  3 +-
 .../administration/AdministrationMenu.java    |  3 +-
 .../administration/AuthorizationMenu.java     |  3 +-
 .../administration/PropertyTypesMenu.java     |  3 +-
 .../menu/administration/TypesMenu.java        |  3 +-
 .../application/menu/modules/ModulesMenu.java |  3 +-
 .../application/menu/top/BrowseMenu.java      |  3 +-
 .../application/menu/top/ImportMenu.java      |  3 +-
 .../client/application/menu/top/NewMenu.java  |  3 +-
 .../application/menu/user/LoggedUserMenu.java |  3 +-
 .../menu/user/action/AboutBoxAction.java      |  3 +-
 .../user/action/ChangeUserSettingsAction.java |  3 +-
 .../menu/user/action/LoginAction.java         | 15 ++++
 .../menu/user/action/LogoutAction.java        |  3 +-
 .../menu/user/action/LogoutCallback.java      |  3 +-
 .../model/AttachmentVersionModel.java         |  3 +-
 .../model/AuthorizationGroupModel.java        |  3 +-
 .../application/model/BaseEntityModel.java    |  3 +-
 .../application/model/DataSetKindModel.java   |  3 +-
 .../application/model/DataSetTypeModel.java   |  3 +-
 .../application/model/DataTypeModel.java      |  3 +-
 .../model/DetailedSearchFieldComboModel.java  |  3 +-
 .../application/model/EntityVisitModel.java   |  3 +-
 .../model/ExperimentTypeModel.java            |  3 +-
 .../application/model/MaterialTypeModel.java  |  3 +-
 .../model/ModelDataPropertyNames.java         |  3 +-
 .../model/ParameterValueModel.java            |  3 +-
 .../client/application/model/PersonModel.java |  3 +-
 .../model/PluginTaskDescriptionModel.java     |  3 +-
 .../application/model/SampleTypeModel.java    |  3 +-
 .../model/SearchableEntityModel.java          |  3 +-
 .../model/SimplifiedBaseModel.java            |  3 +-
 .../model/SimplifiedBaseModelData.java        |  3 +-
 .../client/application/model/SpaceModel.java  |  3 +-
 .../model/VocabularyTermModel.java            |  3 +-
 .../model/renderer/TooltipRenderer.java       |  3 +-
 .../VocabularyPropertyColRenderer.java        |  3 +-
 .../plugin/ClientPluginAdapter.java           |  3 +-
 .../DefaultClientPluginFactoryProvider.java   |  3 +-
 .../application/plugin/IClientPlugin.java     |  3 +-
 .../plugin/IClientPluginFactory.java          |  3 +-
 .../plugin/IClientPluginFactoryProvider.java  |  3 +-
 .../IClientPluginFactoryUsingWildcards.java   |  3 +-
 .../client/application/plugin/IModule.java    |  3 +-
 .../plugin/IModuleInitializationObserver.java |  3 +-
 .../ModuleInitializationController.java       |  3 +-
 .../WildcardSupportingPluginFactoryMap.java   |  3 +-
 .../application/renderer/DateRenderer.java    |  3 +-
 .../renderer/DateStringCellRenderer.java      |  3 +-
 .../renderer/IRealNumberRenderer.java         |  3 +-
 .../application/renderer/LinkRenderer.java    |  3 +-
 .../renderer/MaterialRenderer.java            |  3 +-
 .../renderer/MultilineStringCellRenderer.java | 15 ++++
 .../application/renderer/PersonRenderer.java  |  3 +-
 .../renderer/PropertyTypeRenderer.java        |  3 +-
 .../renderer/RealNumberRenderer.java          | 15 ++++
 .../renderer/TimestampStringCellRenderer.java |  3 +-
 .../VocabularyTermStringCellRenderer.java     | 15 ++++
 .../application/renderer/YesNoRenderer.java   | 15 ++++
 .../core/CustomColumnJSONClientData.java      |  3 +-
 .../core/CustomColumnJSONException.java       |  3 +-
 .../core/CustomColumnJSONParser.java          |  3 +-
 .../core/CustomColumnMethodRenderer.java      |  3 +-
 .../core/CustomColumnStringRenderer.java      |  3 +-
 .../link/CustomColumnLinkRenderer.java        |  3 +-
 .../ui/AbstractBatchRegistrationForm.java     | 15 ++++
 .../ui/AbstractRegistrationForm.java          |  3 +-
 .../client/application/ui/AbstractViewer.java |  3 +-
 .../ui/AbstractViewerWithVerticalSplit.java   |  3 +-
 .../ui/AddAuthorizationGroupDialog.java       |  3 +-
 .../client/application/ui/AddSpaceDialog.java |  3 +-
 .../ui/AuthorizationGroupGrid.java            |  3 +-
 .../ui/AuthorizationGroupSelectionWidget.java |  3 +-
 .../application/ui/BasicLoginCallback.java    |  3 +-
 .../ui/BorderLayoutDataFactory.java           |  3 +-
 .../web/client/application/ui/CodesArea.java  |  3 +-
 .../application/ui/ColumnConfigFactory.java   |  3 +-
 .../ui/ColumnSettingsConfigurer.java          |  3 +-
 .../application/ui/ComponentEventLogger.java  |  3 +-
 .../application/ui/CustomImportComponent.java |  3 +-
 .../application/ui/CustomImportForm.java      |  3 +-
 .../ui/CustomImportTypeSelectionWidget.java   |  3 +-
 .../ui/DisplayedAndSelectedEntities.java      |  3 +-
 .../application/ui/EnterKeyListener.java      | 15 ++++
 .../ui/GeneralImportComponent.java            | 15 ++++
 .../application/ui/LoginPanelAutofill.java    |  3 +-
 .../client/application/ui/LoginWidget.java    |  3 +-
 .../ui/ModulesSectionsManager.java            |  3 +-
 .../web/client/application/ui/PersonGrid.java |  3 +-
 ...sonListDeactivationConfirmationDialog.java |  3 +-
 .../PersonListDeletionConfirmationDialog.java |  3 +-
 .../application/ui/PersonSelectionWidget.java |  3 +-
 .../ui/PropertyValueRenderers.java            |  3 +-
 .../application/ui/RoleAssignmentGrid.java    |  3 +-
 .../application/ui/RowLayoutManager.java      |  3 +-
 .../application/ui/SimpleModeHeader.java      |  3 +-
 .../web/client/application/ui/SpaceGrid.java  |  3 +-
 .../application/ui/SpaceSelectionWidget.java  |  3 +-
 .../client/application/ui/TypedTableGrid.java |  3 +-
 .../ui/TypedTableGridColumnDefinitionUI.java  |  3 +-
 .../AggregationServiceLocatorResolver.java    | 15 ++++
 .../aggregation/AggregationServicePanel.java  |  3 +-
 .../application/ui/amc/AddGroupDialog.java    |  3 +-
 .../application/ui/amc/AddPersonDialog.java   |  3 +-
 .../AddPersonToAuthorizationGroupDialog.java  |  3 +-
 .../ui/amc/AddPropertyTypeDialog.java         | 15 ++++
 .../ui/amc/AddRoleAssignmentDialog.java       |  3 +-
 .../application/ui/amc/RoleListBox.java       |  3 +-
 .../ui/attachment/AttachmentBrowser.java      |  3 +-
 .../attachment/AttachmentDownloadHelper.java  |  3 +-
 ...achmentListDeletionConfirmationDialog.java |  3 +-
 .../framework/IColumnDefinitionUI.java        | 15 ++++
 .../ui/columns/framework/LinkExtractor.java   |  3 +-
 .../specific/GridCustomColumnDefinition.java  |  3 +-
 .../ui/data/AbstractExternalDataGrid.java     |  3 +-
 .../application/ui/data/ComputationData.java  |  3 +-
 .../ui/data/DataSetArchivingMenu.java         |  3 +-
 .../ui/data/DataSetBatchUpdatePanel.java      |  3 +-
 .../ui/data/DataSetComputeUtils.java          |  3 +-
 .../application/ui/data/DataSetGridUtils.java |  3 +-
 ...DataSetListDeletionConfirmationDialog.java |  3 +-
 .../ui/data/DataSetParentsArea.java           |  3 +-
 .../ui/data/DataSetProcessingMenu.java        |  3 +-
 .../ui/data/DataSetReportGenerator.java       |  3 +-
 .../ui/data/DataSetReportLinkRetriever.java   |  3 +-
 .../ui/data/DataSetSearchHitGrid.java         |  4 +-
 .../application/ui/data/DataSetTypeGrid.java  |  3 +-
 .../ui/data/DataSetTypeSelectionWidget.java   |  3 +-
 .../data/DataSetUploadConfirmationDialog.java |  3 +-
 .../ui/data/DataSetUploadForm.java            |  3 +-
 .../application/ui/data/DataSetsArea.java     |  3 +-
 .../ui/data/DataSetsContainedArea.java        |  3 +-
 .../DatastoreServiceDescriptionModel.java     | 15 ++++
 .../ui/data/FileFormatTypeGrid.java           |  2 +-
 .../data/FileFormatTypeSelectionWidget.java   |  3 +-
 .../ui/data/IComputationAction.java           |  3 +-
 .../ui/data/MatchCriteriaRadio.java           |  3 +-
 .../ui/data/PerformComputationDialog.java     |  3 +-
 .../ui/data/ProcessingDisplayCallback.java    |  3 +-
 .../ui/data/RelatedDataSetGrid.java           |  4 +-
 .../data/ReportingPluginSelectionWidget.java  |  3 +-
 .../SelectedOrAllDataSetsRadioProvider.java   |  3 +-
 .../ui/deletion/DeletionForceCheckBox.java    |  3 +-
 .../ui/deletion/DeletionForceOptions.java     |  3 +-
 .../application/ui/deletion/DeletionGrid.java |  3 +-
 .../PermanentDeletionConfirmationDialog.java  |  3 +-
 .../RevertDeletionConfirmationDialog.java     |  3 +-
 .../AbstractEditEntityTypeDialog.java         |  3 +-
 .../entity_type/AbstractEntityTypeGrid.java   |  3 +-
 .../ui/entity_type/AddEntityTypeDialog.java   |  3 +-
 .../ui/entity_type/AddTypeDialog.java         |  3 +-
 .../ui/entity_type/NewEntityTypeForm.java     | 15 ++++
 .../ExperimentBatchRegistrationPanel.java     |  3 +-
 .../ui/experiment/ExperimentBrowserGrid.java  |  3 +-
 .../experiment/ExperimentBrowserToolbar.java  |  3 +-
 .../ExperimentDataSetArchivingMenu.java       |  3 +-
 ...erimentListDeletionConfirmationDialog.java |  3 +-
 .../ExperimentRegistrationPanel.java          |  5 +-
 .../ui/experiment/ExperimentTypeGrid.java     |  3 +-
 .../ExperimentTypeSelectionWidget.java        |  3 +-
 .../ProjectSelectionTreeGridContainer.java    |  3 +-
 .../ui/experiment/ProjectSelectionWidget.java |  3 +-
 ...SelectedOrAllExperimentsRadioProvider.java |  3 +-
 .../application/ui/field/CheckBoxField.java   |  3 +-
 .../ui/field/ChosenEntitySetter.java          |  3 +-
 .../application/ui/field/CodeField.java       |  3 +-
 .../ui/field/CodeFieldWithGenerator.java      |  3 +-
 .../ui/field/DataSetChooserField.java         |  3 +-
 .../ui/field/DateDateFormField.java           |  3 +-
 .../application/ui/field/DateFormField.java   |  3 +-
 .../ui/field/DescriptionField.java            |  3 +-
 .../ui/field/EntityChooserDialog.java         |  3 +-
 .../ui/field/ExperimentChooserField.java      |  3 +-
 .../application/ui/field/HyperlinkField.java  |  3 +-
 .../ui/field/IChosenEntitiesListener.java     |  3 +-
 .../ui/field/IChosenEntitiesProvider.java     |  3 +-
 .../ui/field/IChosenEntitiesSetter.java       |  3 +-
 .../application/ui/field/IParameterField.java |  3 +-
 .../ui/field/IParameterValuesLoader.java      |  3 +-
 .../application/ui/field/IntegerField.java    |  3 +-
 .../ui/field/MaterialChooserField.java        |  3 +-
 .../application/ui/field/MetaprojectArea.java |  3 +-
 .../ui/field/MetaprojectChooserButton.java    |  3 +-
 .../ui/field/MultilineItemsField.java         |  3 +-
 .../ui/field/MultilineVarcharField.java       |  3 +-
 .../application/ui/field/ParameterField.java  |  3 +-
 .../ui/field/PropertyFieldFactory.java        |  3 +-
 .../application/ui/field/RealField.java       |  3 +-
 .../application/ui/field/ReasonField.java     |  3 +-
 .../ui/field/SampleChooserButton.java         |  3 +-
 .../ui/field/SampleChooserField.java          |  3 +-
 .../ui/field/ScriptChooserField.java          |  3 +-
 .../application/ui/field/ScriptField.java     |  3 +-
 .../application/ui/field/VarcharField.java    |  3 +-
 .../ui/field/VocabularyTermField.java         |  3 +-
 .../field/VocabularyTermSelectionWidget.java  |  3 +-
 .../client/application/ui/field/XmlField.java |  3 +-
 .../ui/file/AttachmentFileUploadField.java    |  3 +-
 .../ui/file/AttachmentsFileFieldManager.java  |  3 +-
 .../ui/file/BasicFileFieldManager.java        |  3 +-
 .../application/ui/file/FileFieldManager.java |  3 +-
 ...stractColumnSettingsDataModelProvider.java |  3 +-
 .../ui/grid/AbstractEntityGrid.java           |  3 +-
 .../ui/grid/BrowserGridPagingToolBar.java     |  3 +-
 .../application/ui/grid/ColumnDataModel.java  | 15 ++++
 .../ui/grid/ColumnDefsAndConfigs.java         |  3 +-
 .../application/ui/grid/ColumnListener.java   |  3 +-
 .../ui/grid/ColumnSettingsChooser.java        | 15 ++++
 .../ui/grid/ColumnSettingsDialog.java         | 15 ++++
 .../application/ui/grid/ColumnUtils.java      |  3 +-
 .../grid/CustomColumnsMetadataProvider.java   |  3 +-
 .../ui/grid/DisposableComposite.java          |  3 +-
 .../ui/grid/DisposableEntityChooser.java      |  3 +-
 .../application/ui/grid/ExtendedGridView.java | 15 ++++
 .../client/application/ui/grid/GridUtils.java |  3 +-
 .../ui/grid/IBrowserGridActionInvoker.java    | 15 ++++
 .../application/ui/grid/ICellListener.java    |  3 +-
 .../grid/ICellListenerAndLinkGenerator.java   |  3 +-
 .../ui/grid/IColumnDefinitionProvider.java    | 15 ++++
 .../ui/grid/ICriteriaProvider.java            |  3 +-
 .../ui/grid/IDisplayTypeIDProvider.java       |  3 +-
 .../ui/grid/IDisposableComponent.java         |  3 +-
 .../ui/grid/IDisposableComponentProvider.java |  3 +-
 .../application/ui/grid/ILinkGenerator.java   |  3 +-
 .../application/ui/grid/IModification.java    |  3 +-
 .../ui/grid/ListColumnFilterWidget.java       |  3 +-
 .../application/ui/grid/Modification.java     |  3 +-
 .../ui/grid/ModificationsData.java            |  3 +-
 .../ui/grid/PendingFetchManager.java          |  3 +-
 .../application/ui/grid/TableExportType.java  |  3 +-
 .../ui/grid/TextColumnFilterWidget.java       |  3 +-
 .../ui/grid/entity/PropertyTypesCriteria.java | 15 ++++
 .../entity/PropertyTypesCriteriaProvider.java | 15 ++++
 .../grid/entity/PropertyTypesFilterUtil.java  |  3 +-
 .../column/GridCustomColumnGrid.java          |  3 +-
 ...dCustomExpressionEditOrRegisterDialog.java |  3 +-
 .../expressions/common/GridColumnChooser.java | 15 ++++
 .../common/GridColumnChooserDialog.java       | 15 ++++
 .../expressions/common/IExpressionHolder.java |  3 +-
 .../grid/expressions/filter/FilterModel.java  |  3 +-
 .../filter/FilterSelectionWidget.java         |  3 +-
 .../expressions/filter/FilterToolbar.java     | 15 ++++
 .../filter/GridCustomFilterGrid.java          |  3 +-
 .../filter/IColumnFilterWidget.java           |  3 +-
 .../listener/OpenEntityDetailsTabAction.java  |  3 +-
 .../OpenEntityDetailsTabClickListener.java    |  3 +-
 .../listener/OpenEntityDetailsTabHelper.java  |  3 +-
 .../OpenEntityEditorTabClickListener.java     |  3 +-
 ...OpenExperimentBrowserTabClickListener.java |  3 +-
 .../ManagedPropertyFormHelper.java            |  3 +-
 .../managed_property/ManagedPropertyGrid.java |  3 +-
 .../ManagedPropertyGridActionDialog.java      |  3 +-
 .../ManagedPropertyGridGeneratedCallback.java |  3 +-
 .../MaterialBatchRegistrationUpdatePanel.java |  3 +-
 .../ui/material/MaterialBrowserGrid.java      |  3 +-
 .../ui/material/MaterialBrowserToolbar.java   |  3 +-
 ...aterialListDeletionConfirmationDialog.java |  3 +-
 .../ui/material/MaterialTypeGrid.java         |  3 +-
 .../material/MaterialTypeSelectionWidget.java |  3 +-
 .../browser/MetaprojectBrowser.java           |  3 +-
 .../MetaprojectBrowserEntitiesPanel.java      |  3 +-
 .../browser/MetaprojectBrowserTreePanel.java  |  3 +-
 ...MetaprojectDeletionConfirmationDialog.java |  3 +-
 .../entity/MetaprojectDataSetsGrid.java       |  3 +-
 .../entity/MetaprojectDataSetsSection.java    |  3 +-
 .../entity/MetaprojectEntities.java           |  3 +-
 .../entity/MetaprojectEntitySection.java      |  3 +-
 .../entity/MetaprojectExperimentsSection.java |  3 +-
 .../entity/MetaprojectMaterialsSection.java   |  3 +-
 .../entity/MetaprojectSamplesSection.java     |  3 +-
 .../field/MetaprojectNameField.java           |  3 +-
 .../AbstractMetaprojectEditRegisterForm.java  |  3 +-
 .../metaproject/form/MetaprojectEditForm.java |  3 +-
 .../ui/metaproject/grid/MetaprojectGrid.java  |  3 +-
 .../ui/metaproject/tree/MetaprojectTree.java  |  3 +-
 .../model/MetaprojectTreeEntityItemData.java  |  3 +-
 .../MetaprojectTreeEntityKindItemData.java    |  3 +-
 .../tree/model/MetaprojectTreeItemData.java   |  3 +-
 .../MetaprojectTreeMetaprojectItemData.java   |  3 +-
 .../MetaprojectTreeEntityItemWidget.java      |  3 +-
 .../MetaprojectTreeEntityKindItemWidget.java  |  3 +-
 .../widget/MetaprojectTreeItemWidget.java     |  3 +-
 .../MetaprojectTreeMetaprojectItemWidget.java |  3 +-
 .../viewer/MetaprojectPropertiesPanel.java    |  3 +-
 .../metaproject/viewer/MetaprojectViewer.java |  3 +-
 .../AbstractProjectEditRegisterForm.java      |  3 +-
 .../ui/project/ProjectEditForm.java           |  3 +-
 .../application/ui/project/ProjectGrid.java   |  3 +-
 ...ProjectListDeletionConfirmationDialog.java |  3 +-
 .../ui/project/ProjectRegistrationForm.java   |  3 +-
 .../AbstractPropertyValueRenderer.java        |  3 +-
 .../AbstractSimplePropertyValueRenderer.java  |  3 +-
 .../property/DatePropertyValueRenderer.java   |  3 +-
 .../ui/property/EntityHistoryGrid.java        |  3 +-
 .../ui/property/IPropertyValueRenderer.java   |  3 +-
 .../ObjectArrayPropertyValueRenderer.java     |  3 +-
 .../property/ObjectPropertyValueRenderer.java |  3 +-
 .../application/ui/property/PropertyGrid.java |  3 +-
 .../DataTypeSelectionWidget.java              |  3 +-
 ...EntityTypePropertyTypeSelectionWidget.java |  3 +-
 .../PluginTypeSelectionWidget.java            |  3 +-
 .../PropertyTypeAssignmentForm.java           |  3 +-
 .../PropertyTypeAssignmentGrid.java           |  3 +-
 ...tyTypeAssignmentGridAssignmentsHolder.java |  3 +-
 .../ui/property_type/PropertyTypeGrid.java    |  3 +-
 ...rtyTypeListDeletionConfirmationDialog.java |  3 +-
 .../PropertyTypeRegistrationForm.java         |  3 +-
 .../PropertyTypeSelectionWidget.java          |  3 +-
 .../ScriptTypeSelectionWidget.java            |  3 +-
 .../property_type/SectionSelectionWidget.java |  3 +-
 .../ui/report/ReportGeneratedCallback.java    |  3 +-
 .../application/ui/report/ReportGrid.java     |  3 +-
 .../ui/sample/IPropertyTypesProvider.java     |  3 +-
 .../ui/sample/ISampleCriteriaProvider.java    |  3 +-
 .../SampleBatchRegisterUpdatePanel.java       |  3 +-
 .../ui/sample/SampleBrowserGrid.java          |  3 +-
 .../ui/sample/SampleBrowserToolbar.java       |  3 +-
 .../SampleListDeletionConfirmationDialog.java |  3 +-
 .../ui/sample/SampleRegistrationPanel.java    |  5 +-
 .../sample/SampleRegistrationTypeFilter.java  |  3 +-
 .../ui/sample/SampleSearchHitGrid.java        |  4 +-
 .../application/ui/sample/SampleTypeGrid.java |  3 +-
 .../ui/sample/SampleTypeSelectionWidget.java  |  3 +-
 .../sample/SemanticAnnotationGridColumns.java |  3 +-
 .../AbstractScriptEditRegisterForm.java       |  3 +-
 .../ui/script/EntityKindSelectionWidget.java  |  3 +-
 .../application/ui/script/IValidable.java     |  3 +-
 .../application/ui/script/ScriptEditForm.java |  3 +-
 .../ui/script/ScriptExecutionFramework.java   |  3 +-
 .../application/ui/script/ScriptGrid.java     |  3 +-
 .../ui/script/ScriptRegistrationForm.java     |  3 +-
 .../search/DetailedDataSetSearchToolbar.java  | 15 ++++
 .../search/DetailedSearchCriteriaWidget.java  |  3 +-
 .../search/DetailedSearchCriterionWidget.java |  3 +-
 .../DetailedSearchFieldsSelectionWidget.java  |  3 +-
 .../DetailedSearchMainCriteriaWidget.java     |  3 +-
 .../DetailedSearchSubCriteriaWidget.java      |  3 +-
 .../ui/search/DetailedSearchToolbar.java      | 15 ++++
 .../ui/search/DetailedSearchWindow.java       | 15 ++++
 .../ui/search/IDetailedSearchHitGrid.java     |  3 +-
 .../ui/search/MatchCriteriaRadio.java         |  3 +-
 .../ui/user/ChangeUserSettingsDialog.java     |  3 +-
 .../ui/vocabulary/AddVocabularyDialog.java    | 15 ++++
 .../ui/vocabulary/VocabularyGrid.java         |  3 +-
 ...abularyListDeletionConfirmationDialog.java |  3 +-
 .../VocabularyRegistrationFieldSet.java       |  3 +-
 .../VocabularyRegistrationForm.java           |  3 +-
 .../vocabulary/VocabularySelectionWidget.java |  3 +-
 .../ui/vocabulary/VocabularyTermGrid.java     |  3 +-
 .../VocabularyTermSingleCodeValidator.java    | 15 ++++
 .../vocabulary/VocabularyTermValidator.java   | 15 ++++
 .../ui/webapp/WebAppComponent.java            |  3 +-
 .../WebAppSortingAndCodeComparator.java       |  3 +-
 .../application/ui/webapp/WebAppUrl.java      |  3 +-
 .../ui/webapp/WebAppUrlParameter.java         |  3 +-
 .../AbstractDataConfirmationDialog.java       |  3 +-
 ...actDataListDeletionConfirmationDialog.java |  3 +-
 ...stPermanentDeletionConfirmationDialog.java |  3 +-
 ...taListTrashDeletionConfirmationDialog.java |  3 +-
 .../AbstractGridDataRefreshCallback.java      |  3 +-
 .../ui/widget/AbstractRegistrationDialog.java |  3 +-
 .../ui/widget/AbstractSaveDialog.java         |  3 +-
 .../ui/widget/ButtonWithConfirmations.java    |  3 +-
 .../ui/widget/ButtonWithLoadingMask.java      |  3 +-
 .../ui/widget/CheckBoxGroupWithModel.java     |  3 +-
 .../ui/widget/ClickableFormPanel.java         |  3 +-
 .../ui/widget/ConfirmationDialog.java         |  3 +-
 .../application/ui/widget/DropDownList.java   |  3 +-
 .../ui/widget/EntityLinkMessageElement.java   |  3 +-
 .../ui/widget/EntityRegistrationPanel.java    |  3 +-
 .../ui/widget/ExternalHyperlink.java          |  3 +-
 .../application/ui/widget/FieldUtil.java      |  3 +-
 .../ui/widget/FormPanelWithSavePoint.java     |  3 +-
 .../application/ui/widget/HistoryWidget.java  |  3 +-
 .../ui/widget/HtmlMessageElement.java         |  3 +-
 .../ui/widget/IDataRefreshCallback.java       |  3 +-
 .../application/ui/widget/IInfoHandler.java   |  3 +-
 .../ui/widget/IMessageElement.java            |  3 +-
 .../client/application/ui/widget/InfoBox.java |  3 +-
 .../application/ui/widget/InfoType.java       | 15 ++++
 .../ui/widget/InlineHyperlink.java            |  3 +-
 .../application/ui/widget/LabeledItem.java    | 15 ++++
 .../application/ui/widget/MultilineHTML.java  |  3 +-
 .../ui/widget/NotScrollableContainer.java     |  3 +-
 .../widget/PopupDialogBasedInfoHandler.java   |  3 +-
 .../SampleRegistrationLinkMessageElement.java |  3 +-
 .../application/ui/widget/SectionsPanel.java  | 15 ++++
 .../application/ui/widget/SimpleDialog.java   |  3 +-
 .../ui/widget/SimpleModelComboBox.java        | 15 ++++
 .../ui/wizard/IWizardDataModel.java           |  3 +-
 .../application/ui/wizard/IWizardState.java   |  3 +-
 .../ui/wizard/IWizardStateChangeListener.java |  3 +-
 .../client/application/ui/wizard/Wizard.java  |  3 +-
 .../application/ui/wizard/WizardPage.java     |  3 +-
 .../ui/wizard/WizardWorkflowModel.java        |  3 +-
 .../application/util/BorderLayoutHelper.java  |  3 +-
 .../util/CompositeMessageProvider.java        |  3 +-
 .../web/client/application/util/DOMUtils.java |  3 +-
 .../client/application/util/DataSetUtils.java |  3 +-
 .../util/DialogWithOnlineHelpUtils.java       |  3 +-
 .../util/DictonaryBasedMessageProvider.java   |  3 +-
 .../util/EntityDeletionConfirmationUtils.java | 15 ++++
 .../application/util/EntityPropertyUtils.java |  3 +-
 .../application/util/EntityTypeUtils.java     |  3 +-
 .../web/client/application/util/GWTUtils.java |  3 +-
 .../application/util/IDelegatedAction.java    |  3 +-
 .../util/IDelegatedActionWithResult.java      |  3 +-
 .../util/IDirectlyConnectedController.java    |  3 +-
 .../application/util/IMessageProvider.java    |  3 +-
 .../application/util/IResultUpdater.java      |  3 +-
 .../web/client/application/util/SetUtils.java |  3 +-
 .../client/application/util/TextToolItem.java |  3 +-
 .../application/util/ToolTipAction.java       |  3 +-
 .../application/util/URLListEncoder.java      |  3 +-
 .../client/application/util/WidgetUtils.java  |  3 +-
 .../client/application/util/WindowUtils.java  |  3 +-
 .../application/util/lang/Entities.java       | 15 ++++
 .../application/util/lang/IntHashMap.java     | 15 ++++
 .../util/lang/StringEscapeUtils.java          | 15 ++++
 .../application/util/log/HostedModeLog.java   |  3 +-
 .../application/util/log/IProfilingTable.java |  3 +-
 .../web/client/application/util/log/Log.java  |  3 +-
 .../client/application/util/log/LogImpl.java  |  3 +-
 .../application/util/log/LoggingConsole.java  |  3 +-
 .../application/util/log/ProfilingTable.java  |  3 +-
 .../application/util/log/WebModeLog.java      |  3 +-
 .../web/client/dto/ApplicationInfo.java       |  3 +-
 .../web/client/dto/ArchivingResult.java       |  3 +-
 .../client/dto/AttachmentGridColumnIDs.java   |  3 +-
 .../dto/AuthorizationGroupGridColumnIDs.java  |  3 +-
 .../web/client/dto/ColumnDistinctValues.java  |  3 +-
 .../client/web/client/dto/ColumnIDUtils.java  |  3 +-
 .../web/client/dto/CommonGridColumnIDs.java   |  3 +-
 .../client/web/client/dto/Constants.java      |  3 +-
 .../web/client/dto/CustomFilterInfo.java      |  3 +-
 .../dto/CustomGridColumnGridColumnIDs.java    |  3 +-
 .../client/dto/DataSetTypeGridColumnIDs.java  |  3 +-
 .../client/web/client/dto/DataSetUpdates.java |  3 +-
 .../client/dto/DataSetUploadParameters.java   |  3 +-
 .../client/dto/DefaultResultSetConfig.java    |  3 +-
 .../web/client/dto/DeletionGridColumnIDs.java |  3 +-
 ...splayedCriteriaOrSelectedEntityHolder.java | 83 ++++++++++++++++++-
 .../DisplayedOrSelectedDatasetCriteria.java   |  3 +-
 .../DisplayedOrSelectedIdHolderCriteria.java  | 74 ++++++++++++++++-
 .../dto/EntityHistoryGridColumnIDs.java       |  3 +-
 .../web/client/dto/EntityPropertyUpdates.java |  3 +-
 .../dto/EntityPropertyUpdatesResult.java      |  3 +-
 .../client/dto/EntityTypeGridColumnIDs.java   |  3 +-
 .../dto/ExperimentBrowserGridColumnIDs.java   |  3 +-
 .../web/client/dto/ExperimentIdentifier.java  |  3 +-
 .../client/dto/ExternalDataGridColumnIDs.java |  3 +-
 .../dto/FileFormatTypeGridColumnIDs.java      |  3 +-
 .../web/client/dto/GenericConstants.java      |  3 +-
 .../web/client/dto/GridColumnFilterInfo.java  |  3 +-
 .../web/client/dto/GridCustomColumnInfo.java  |  3 +-
 .../client/web/client/dto/GridFilters.java    |  3 +-
 .../client/web/client/dto/GridRowModels.java  |  3 +-
 .../web/client/dto/IResultSetConfig.java      |  3 +-
 .../web/client/dto/IResultSetHolder.java      |  3 +-
 .../client/web/client/dto/IUpdateResult.java  |  3 +-
 .../dto/ListEntityDisplayCriteriaKind.java    |  3 +-
 .../client/dto/ListEntityHistoryCriteria.java |  3 +-
 .../client/dto/ListExperimentsCriteria.java   |  3 +-
 .../dto/ListMaterialDisplayCriteria.java      |  3 +-
 .../client/dto/ListMetaprojectsCriteria.java  |  3 +-
 .../web/client/dto/ListPersonsCriteria.java   |  2 +-
 .../client/dto/ListSampleDisplayCriteria.java |  3 +-
 .../dto/ListSampleDisplayCriteria2.java       |  3 +-
 .../web/client/dto/ListScriptsCriteria.java   |  2 +-
 .../dto/MatchingEntitiesPanelColumnIDs.java   |  3 +-
 .../web/client/dto/MaterialGridColumnIDs.java |  3 +-
 .../client/dto/MetaprojectGridColumnIDs.java  |  3 +-
 .../web/client/dto/PersonGridColumnIDs.java   |  3 +-
 .../web/client/dto/ProjectGridColumnIDs.java  |  3 +-
 .../PropertyTypeAssignmentGridColumnIDs.java  |  3 +-
 .../client/dto/PropertyTypeGridColumnIDs.java |  3 +-
 .../client/dto/RelatedDataSetCriteria.java    |  3 +-
 .../client/web/client/dto/ResultSet.java      |  3 +-
 .../web/client/dto/ResultSetFetchConfig.java  |  3 +-
 .../client/dto/ResultSetWithEntityTypes.java  |  3 +-
 .../dto/RoleAssignmentGridColumnIDs.java      |  3 +-
 .../web/client/dto/SampleChildrenInfo.java    |  3 +-
 .../web/client/dto/SampleGridColumnIDs.java   |  3 +-
 .../client/dto/SampleTypeGridColumnIDs.java   |  3 +-
 .../client/web/client/dto/SampleUpdates.java  |  3 +-
 .../web/client/dto/ScriptGridColumnIDs.java   |  3 +-
 .../client/web/client/dto/SearchOption.java   |  3 +-
 .../web/client/dto/SearchableEntity.java      |  3 +-
 .../dto/SemanticAnnotationGridColumnIDs.java  |  3 +-
 .../client/web/client/dto/SessionContext.java |  3 +-
 .../web/client/dto/SpaceGridColumnIDs.java    |  3 +-
 .../web/client/dto/TableExportCriteria.java   |  3 +-
 .../web/client/dto/TableModelReference.java   |  3 +-
 .../generic/client/web/client/dto/Type.java   | 15 ++++
 .../web/client/dto/TypedTableResultSet.java   |  3 +-
 .../generic/client/web/client/dto/User.java   |  3 +-
 .../client/dto/VocabularyGridColumnIDs.java   |  3 +-
 .../exception/InvalidSessionException.java    |  3 +-
 .../exception/UserFailureException.java       |  3 +-
 .../web/server/AbstractClientService.java     |  3 +-
 .../server/AbstractFileDownloadServlet.java   |  3 +-
 .../server/AbstractOriginalDataProvider.java  |  3 +-
 ...actOriginalDataProviderWithoutHeaders.java |  3 +-
 .../client/web/server/AbstractServlet.java    |  3 +-
 .../server/AttachmentRegistrationHelper.java  | 15 ++++
 ...entServiceExceptionTranslatingAdvisor.java |  3 +-
 .../web/server/CommonClientService.java       |  3 +-
 .../server/CommonClientServiceServlet.java    |  3 +-
 .../web/server/DownloadServiceServlet.java    |  3 +-
 .../web/server/FileExportServiceServlet.java  |  3 +-
 .../server/FileTemplateServiceServlet.java    |  3 +-
 .../web/server/HelpRedirectServlet.java       |  3 +-
 .../web/server/IBasicTableDataProvider.java   |  3 +-
 ...ListDataSetSearchOriginalDataProvider.java | 15 ++++
 .../ListExperimentsOriginalDataProvider.java  |  3 +-
 ...istRelatedDataSetOriginalDataProvider.java | 15 ++++
 .../ListSamplesOriginalDataProvider.java      | 15 ++++
 .../generic/client/web/server/Message.java    |  3 +-
 .../StringHtmlEscapingPointcutAdvisor.java    |  3 +-
 .../web/server/UploadServiceServlet.java      |  3 +-
 .../client/web/server/UploadedFilesBean.java  |  3 +-
 .../server/calculator/ColumnDefinition.java   |  3 +-
 .../web/server/calculator/ColumnGroup.java    |  3 +-
 .../calculator/ComparableCellValueHelper.java |  3 +-
 .../calculator/GridExpressionUtils.java       |  3 +-
 .../server/calculator/ITableDataProvider.java |  3 +-
 .../client/web/server/calculator/Row.java     |  3 +-
 .../web/server/calculator/RowCalculator.java  |  3 +-
 .../server/calculator/VocabularyColumn.java   |  3 +-
 .../web/server/queue/ConsumerQueue.java       | 15 ++++
 .../client/web/server/queue/ConsumerTask.java | 15 ++++
 .../AbstractCommonTableModelProvider.java     |  3 +-
 .../resultset/AbstractExpressionProvider.java |  3 +-
 .../AbstractExternalDataProvider.java         |  3 +-
 .../resultset/AbstractMaterialProvider.java   |  3 +-
 .../resultset/AbstractTableModelProvider.java |  3 +-
 .../resultset/AttachmentVersionsProvider.java |  3 +-
 .../resultset/AuthorizationGroupProvider.java |  3 +-
 .../web/server/resultset/CacheManager.java    |  3 +-
 .../resultset/CachedResultSetManager.java     |  3 +-
 .../client/web/server/resultset/Column.java   |  3 +-
 .../web/server/resultset/ColumnSortUtils.java |  3 +-
 .../resultset/CustomGridColumnProvider.java   |  3 +-
 .../server/resultset/DataProviderAdapter.java |  3 +-
 .../server/resultset/DataSetTypeProvider.java |  3 +-
 .../server/resultset/DefaultResultSet.java    |  3 +-
 .../server/resultset/DeletionsProvider.java   |  3 +-
 .../resultset/EntityHistoryProvider.java      |  3 +-
 ...EntityTypePropertyTypeBrowserProvider.java |  3 +-
 .../EntityTypePropertyTypeProvider.java       |  3 +-
 .../server/resultset/EntityTypeProvider.java  |  3 +-
 .../server/resultset/ExperimentProvider.java  |  3 +-
 .../resultset/FileFormatTypesProvider.java    |  3 +-
 .../resultset/GridCustomFilterProvider.java   |  3 +-
 .../server/resultset/IColumnCalculator.java   |  3 +-
 .../resultset/ICustomColumnsProvider.java     |  3 +-
 .../resultset/IOriginalDataProvider.java      |  3 +-
 .../web/server/resultset/IResultSet.java      |  3 +-
 .../resultset/IResultSetKeyGenerator.java     |  3 +-
 .../server/resultset/IResultSetManager.java   |  3 +-
 .../server/resultset/ITableModelProvider.java |  3 +-
 .../resultset/MatchingEntitiesProvider.java   |  3 +-
 .../MaterialDisambiguationProvider.java       |  3 +-
 .../server/resultset/MetaprojectProvider.java |  3 +-
 .../web/server/resultset/PersonsProvider.java |  3 +-
 .../server/resultset/ProjectsProvider.java    |  3 +-
 .../resultset/PropertyTypeProvider.java       |  3 +-
 .../resultset/RoleAssignmentProvider.java     |  3 +-
 .../web/server/resultset/SampleProvider.java  |  3 +-
 .../server/resultset/SampleTypeProvider.java  |  3 +-
 .../web/server/resultset/ScriptProvider.java  |  3 +-
 .../resultset/SemanticAnnotationProvider.java |  3 +-
 .../web/server/resultset/SpacesProvider.java  |  3 +-
 .../web/server/resultset/TableData.java       |  3 +-
 .../web/server/resultset/TableDataCache.java  |  3 +-
 .../resultset/TableDataProviderFactory.java   |  3 +-
 .../resultset/TableForUpdateExporter.java     |  3 +-
 .../resultset/VocabulariesProvider.java       |  3 +-
 .../resultset/VocabularyTermsProvider.java    |  3 +-
 .../translator/ResultSetTranslator.java       |  3 +-
 .../SearchableEntityTranslator.java           |  3 +-
 .../SearchableSearchDomainTranslator.java     |  3 +-
 .../UserFailureExceptionTranslator.java       |  3 +-
 .../client/web/server/util/HttpUtils.java     |  3 +-
 .../client/web/server/util/OSKind.java        |  3 +-
 .../client/web/server/util/TSVRenderer.java   |  3 +-
 .../web/server/util/TableModelUtils.java      |  3 +-
 .../server/util/XMLPropertyTransformer.java   |  3 +-
 .../generic/server/AbstractASyncAction.java   |  3 +-
 .../generic/server/AbstractCommonServer.java  |  3 +-
 .../generic/server/AbstractServer.java        |  3 +-
 .../server/AuthenticationServiceHolder.java   |  3 +-
 .../openbis/generic/server/CacheFilter.java   |  3 +-
 .../server/CommonBusinessObjectFactory.java   |  3 +-
 .../openbis/generic/server/CommonServer.java  |  3 +-
 .../generic/server/CommonServerLogger.java    |  3 +-
 .../generic/server/CommonServiceProvider.java |  3 +-
 .../generic/server/CommonServiceServer.java   |  3 +-
 .../generic/server/ComponentNames.java        |  3 +-
 .../generic/server/ConcurrentOperation.java   |  3 +-
 .../server/ConcurrentOperationLimit.java      |  3 +-
 .../server/ConcurrentOperationLimiter.java    |  3 +-
 .../ConcurrentOperationLimiterConfig.java     |  3 +-
 .../server/DataStoreServiceRegistrator.java   |  3 +-
 .../DatabaseLastModificationAdvisor.java      |  3 +-
 .../server/DisplaySettingsProvider.java       |  3 +-
 .../server/ETLEntityOperationChecker.java     |  3 +-
 .../generic/server/ETLServiceServer.java      |  3 +-
 .../generic/server/EntityGroupingDAG.java     |  3 +-
 .../server/EntityOperationsInProgress.java    |  3 +-
 .../server/GenericHttpSessionListener.java    |  3 +-
 .../server/HotDeploymentController.java       |  3 +-
 .../openbis/generic/server/IASyncAction.java  |  3 +-
 .../server/ICommonServerForInternalUse.java   |  3 +-
 .../server/IConcurrentOperationLimiter.java   |  3 +-
 .../server/IDataStoreServiceRegistrator.java  |  3 +-
 .../server/IETLEntityOperationChecker.java    |  3 +-
 .../server/IHotDeploymentController.java      |  3 +-
 .../generic/server/JythonEvaluatorPool.java   |  3 +-
 .../generic/server/LoggerNameFilter.java      |  3 +-
 .../server/LongRunningThreadAdvisor.java      |  3 +-
 .../server/LongRunningThreadInterceptor.java  |  3 +-
 .../LongRunningThreadLogConfiguration.java    |  3 +-
 .../server/LongRunningThreadLogger.java       |  3 +-
 .../server/MaintenanceTaskStarter.java        |  3 +-
 .../generic/server/MaterialGroupingDAG.java   |  3 +-
 .../generic/server/MaterialHelper.java        |  3 +-
 .../server/MetaprojectAssignmentsHelper.java  |  3 +-
 .../generic/server/NameServerServlet.java     |  3 +-
 .../generic/server/NewExternalDataDAG.java    |  3 +-
 .../generic/server/OpenBisSessionManager.java |  3 +-
 .../server/OpenbisCrossOriginFilter.java      |  3 +-
 .../server/OptimisticLockingRetryAdvisor.java |  3 +-
 .../generic/server/SampleGroupingDAG.java     |  3 +-
 .../openbis/generic/server/SearchHelper.java  |  3 +-
 .../ServerExceptionTranslatingAdvisor.java    |  3 +-
 .../ServiceConversationClientManager.java     |  3 +-
 ...erviceConversationClientManagerServer.java |  3 +-
 .../ServiceConversationServerManager.java     |  3 +-
 ...erviceConversationServerManagerServer.java |  3 +-
 .../server/ServiceForDataStoreServer.java     |  3 +-
 .../ServiceForDataStoreServerLogger.java      |  3 +-
 .../generic/server/SessionFactory.java        |  3 +-
 .../generic/server/TrackingServer.java        |  3 +-
 .../generic/server/TrackingServerLogger.java  |  3 +-
 .../generic/server/TrackingServiceServer.java |  3 +-
 .../TrustedCrossOriginDomainsProvider.java    |  3 +-
 .../WhiteListBasedRemoteHostValidator.java    |  3 +-
 ...entToDataSetRelatedEntitiesTranslator.java | 15 ++++
 .../v1/GeneralInformationChangingService.java |  3 +-
 ...lInformationChangingServiceJsonServer.java |  3 +-
 ...neralInformationChangingServiceLogger.java |  3 +-
 ...neralInformationChangingServiceServer.java |  3 +-
 .../api/v1/GeneralInformationService.java     |  3 +-
 .../GeneralInformationServiceJsonServer.java  |  3 +-
 .../v1/GeneralInformationServiceLogger.java   |  3 +-
 .../v1/GeneralInformationServiceServer.java   |  3 +-
 .../generic/server/api/v1/ResourceNames.java  |  3 +-
 ...pleToDataSetRelatedEntitiesTranslator.java |  3 +-
 ...riaToDetailedSearchCriteriaTranslator.java |  3 +-
 .../server/api/v1/WebInformationService.java  |  3 +-
 .../v1/WebInformationServiceJsonServer.java   |  3 +-
 .../WebInformationServiceResourceNames.java   |  3 +-
 .../api/v1/sort/SampleSearchResultSorter.java |  2 +-
 .../authorization/ActiveAuthorization.java    |  3 +-
 .../AlwaysStatusOkAccessController.java       |  3 +-
 .../server/authorization/Argument.java        | 15 ++++
 .../authorization/AuthorizationAdvisor.java   |  3 +-
 .../AuthorizationDataProvider.java            | 15 ++++
 .../AuthorizationServiceUtils.java            |  3 +-
 .../server/authorization/CapabilityMap.java   |  3 +-
 .../DefaultAccessController.java              |  3 +-
 .../DefaultReturnValueFilter.java             |  3 +-
 .../authorization/IAccessController.java      |  3 +-
 .../IAuthorizationComponentFactory.java       |  3 +-
 .../IAuthorizationDataProvider.java           |  3 +-
 .../authorization/IPredicateFactory.java      |  3 +-
 .../authorization/IReturnValueFilter.java     |  3 +-
 .../server/authorization/NoAuthorization.java |  3 +-
 .../authorization/NoReturnValueFilter.java    |  3 +-
 .../authorization/PredicateExecutor.java      |  3 +-
 .../authorization/PredicateFactory.java       |  3 +-
 .../authorization/RoleWithIdentifier.java     |  3 +-
 .../server/authorization/SpaceOwnerKind.java  |  3 +-
 .../server/authorization/ValidatorStore.java  |  3 +-
 .../annotation/AuthorizationGuard.java        |  3 +-
 .../authorization/annotation/Capability.java  |  3 +-
 .../annotation/ReturnValueFilter.java         |  3 +-
 .../annotation/RolesAllowed.java              |  3 +-
 .../annotation/ShouldFlattenCollections.java  |  3 +-
 .../AbstractDatabaseInstancePredicate.java    |  3 +-
 .../AbstractExperimentPredicate.java          |  3 +-
 .../AbstractExpressionPredicate.java          |  3 +-
 .../predicate/AbstractPredicate.java          |  3 +-
 .../predicate/AbstractProjectPredicate.java   |  3 +-
 .../predicate/AbstractSamplePredicate.java    |  3 +-
 .../predicate/AbstractSpacePredicate.java     |  4 +-
 .../AbstractTechIdCollectionPredicate.java    |  3 +-
 .../predicate/AbstractTechIdPredicate.java    |  3 +-
 .../predicate/ArrayPredicate.java             |  3 +-
 .../predicate/AtomicOperationsPredicate.java  |  3 +-
 .../BasicEntityDescriptionPredicate.java      |  3 +-
 .../predicate/CollectionPredicate.java        |  3 +-
 .../predicate/DataPEPredicate.java            |  3 +-
 .../DataSetAccessPECollectionPredicate.java   |  3 +-
 .../predicate/DataSetAccessPEPredicate.java   |  3 +-
 .../DataSetCodeCollectionPredicate.java       |  3 +-
 .../predicate/DataSetCodePredicate.java       |  3 +-
 .../DataSetTechIdCollectionPredicate.java     |  3 +-
 .../predicate/DataSetTechIdPredicate.java     |  3 +-
 .../DataSetUpdatesCollectionPredicate.java    |  3 +-
 .../predicate/DataSetUpdatesPredicate.java    |  3 +-
 .../DatabaseInstanceIdentifierPredicate.java  |  3 +-
 .../DelegatedNullableAbstractPredicate.java   |  3 +-
 .../predicate/DelegatedPredicate.java         |  3 +-
 .../DeletionTechIdCollectionPredicate.java    |  3 +-
 .../ExistingSampleIdentifierPredicate.java    |  3 +-
 ...tingSpaceIdentifierOrProjectPredicate.java |  3 +-
 .../ExistingSpaceIdentifierPredicate.java     |  3 +-
 ...ExperimentAccessPECollectionPredicate.java |  4 +-
 .../ExperimentAccessPEPredicate.java          |  3 +-
 .../ExperimentAugmentedCodePredicate.java     |  3 +-
 .../predicate/ExperimentIdPredicate.java      |  3 +-
 .../predicate/ExperimentListPredicate.java    |  3 +-
 .../ExperimentPEOrNullPredicate.java          |  3 +-
 .../predicate/ExperimentPEPredicate.java      |  3 +-
 .../predicate/ExperimentPermIdPredicate.java  |  3 +-
 .../predicate/ExperimentUpdatesPredicate.java |  3 +-
 .../authorization/predicate/IPredicate.java   |  3 +-
 .../ListSampleCriteriaPredicate.java          |  3 +-
 .../ListSamplesByPropertyPredicate.java       |  3 +-
 .../predicate/MetaprojectIdPredicate.java     |  3 +-
 .../predicate/MetaprojectPredicate.java       |  3 +-
 .../predicate/MetaprojectTechIdPredicate.java |  3 +-
 .../NewDataSetsWithTypePredicate.java         |  3 +-
 .../predicate/NewExperimentPredicate.java     |  3 +-
 .../NewExperimentsWithTypePredicate.java      |  3 +-
 .../predicate/NewExternalDataPredicate.java   |  3 +-
 .../predicate/NewProjectPredicate.java        |  3 +-
 .../NewSampleCollectionPredicate.java         |  3 +-
 .../NewSampleIdentifierPredicate.java         |  3 +-
 .../predicate/NewSamplePredicate.java         |  3 +-
 .../NewSamplesWithTypePredicate.java          |  3 +-
 .../NullableGroupIdentifierPredicate.java     |  3 +-
 .../predicate/PersistentEntityPredicate.java  |  3 +-
 .../ProjectAugmentedCodePredicate.java        |  3 +-
 .../predicate/ProjectIdPredicate.java         |  3 +-
 ...ojectIdentifierExistingSpacePredicate.java |  3 +-
 .../predicate/ProjectIdentifierPredicate.java |  3 +-
 .../predicate/ProjectPEPredicate.java         |  3 +-
 .../predicate/ProjectPermIdPredicate.java     |  3 +-
 .../ProjectPermIdStringPredicate.java         |  3 +-
 .../predicate/ProjectPredicate.java           |  3 +-
 .../predicate/ProjectUpdatesPredicate.java    |  3 +-
 .../predicate/RevertDeletionPredicate.java    |  3 +-
 .../SampleAccessPECollectionPredicate.java    |  3 +-
 .../predicate/SampleAccessPEPredicate.java    |  3 +-
 .../SampleAugmentedCodePredicate.java         |  3 +-
 ...SampleAugmentedCodeReadWritePredicate.java |  3 +-
 .../predicate/SampleIdPredicate.java          |  3 +-
 .../SampleIdentifierCollectionPredicate.java  |  3 +-
 .../predicate/SampleIdentifierPredicate.java  |  3 +-
 .../predicate/SampleListPredicate.java        |  3 +-
 ...pleOwnerIdentifierCollectionPredicate.java |  3 +-
 .../predicate/SamplePEOrNullPredicate.java    |  3 +-
 .../predicate/SamplePEPredicate.java          |  3 +-
 .../SamplePermIdNullAllowedPredicate.java     |  3 +-
 .../predicate/SamplePermIdPredicate.java      |  3 +-
 .../SamplePermIdStringPredicate.java          |  3 +-
 .../predicate/SamplePredicate.java            |  3 +-
 .../SampleTechIdCollectionPredicate.java      |  3 +-
 ...pleTechIdCollectionReadWritePredicate.java |  3 +-
 .../predicate/SampleTechIdPredicate.java      |  3 +-
 .../SampleTechIdReadWritePredicate.java       |  3 +-
 .../SampleUpdatesCollectionPredicate.java     |  3 +-
 .../predicate/SampleUpdatesPredicate.java     |  3 +-
 .../predicate/SpaceIdentifierPredicate.java   |  3 +-
 .../predicate/SpaceOrProjectPredicate.java    |  3 +-
 .../predicate/SpacePEPredicate.java           |  3 +-
 .../predicate/SpaceUpdatesPredicate.java      |  3 +-
 .../UpdatedExperimentsWithTypePredicate.java  |  3 +-
 .../predicate/V3DeletionIdPredicate.java      | 15 ++++
 .../predicate/V3RevertDeletionPredicate.java  | 15 ++++
 .../v3tov1/DeletionIdTranslator.java          | 15 ++++
 .../project/IProjectAuthorization.java        |  3 +-
 .../project/ProjectAuthorizationBuilder.java  |  3 +-
 .../project/ProjectAuthorizationDisabled.java |  3 +-
 .../project/ProjectAuthorizationEnabled.java  |  3 +-
 .../project/data/object/IObject.java          |  3 +-
 .../project/data/object/Object.java           |  3 +-
 .../project/data/project/IProject.java        |  3 +-
 .../project/ProjectFromIIdentifierHolder.java |  3 +-
 .../data/project/ProjectFromIdentifier.java   |  3 +-
 .../data/project/ProjectFromProject.java      |  3 +-
 .../data/project/ProjectFromProjectPE.java    |  3 +-
 .../data/project/ProjectFromProjectV1.java    |  3 +-
 .../project/data/role/IRole.java              |  3 +-
 .../data/role/RoleFromRoleAssignmentPE.java   |  3 +-
 .../data/role/RoleFromRoleWithIdentifier.java |  3 +-
 .../provider/object/IObjectsProvider.java     |  3 +-
 .../provider/object/SingleObjectProvider.java |  3 +-
 ...oviderFromExperimentIIdentifierHolder.java |  3 +-
 ...roviderFromExperimentIdentifierString.java |  3 +-
 .../ProjectProviderFromExperimentPE.java      |  3 +-
 .../ProjectProviderFromExperimentPermId.java  |  3 +-
 .../ProjectProviderFromExperimentTechId.java  |  3 +-
 .../ProjectProviderFromNewExperiment.java     |  3 +-
 .../ProjectProviderFromNewProject.java        |  3 +-
 .../project/ProjectProviderFromProject.java   |  3 +-
 ...tProviderFromProjectIIdentifierHolder.java |  3 +-
 ...ctProviderFromProjectIdentifierObject.java |  3 +-
 ...ctProviderFromProjectIdentifierString.java |  3 +-
 .../project/ProjectProviderFromProjectPE.java |  3 +-
 .../ProjectProviderFromProjectTechId.java     |  3 +-
 .../project/ProjectProviderFromProjectV1.java |  3 +-
 .../project/ProjectProviderFromSample.java    |  3 +-
 ...ectProviderFromSampleIdentifierString.java |  3 +-
 ...ectProviderFromSpaceCodeAndSampleCode.java |  3 +-
 ...roviderFromExperimentTechIdCollection.java |  3 +-
 ...ctsProviderFromExperimentV1Collection.java |  3 +-
 ...tsProviderFromProjectTechIdCollection.java |  3 +-
 ...rojectsProviderFromSampleV1Collection.java |  3 +-
 .../project/provider/role/IRolesProvider.java |  3 +-
 .../role/RolesProviderFromPersonPE.java       |  3 +-
 .../RolesProviderFromRolesWithIdentifier.java |  3 +-
 .../project/provider/user/IUserProvider.java  |  3 +-
 .../user/UserProviderFromPersonPE.java        |  3 +-
 .../AbstractCollectionValidator.java          |  3 +-
 ...ExperimentOrSampleIdentifierValidator.java |  3 +-
 .../AbstractIdentifierValidator.java          |  3 +-
 .../validator/AbstractValidator.java          |  3 +-
 ...ExperimentOrSampleIdentifierValidator.java |  3 +-
 ...ExperimentOrSampleIdentifierValidator.java |  3 +-
 .../validator/DeletionValidator.java          |  3 +-
 .../validator/EntityHistoryValidator.java     |  3 +-
 .../ExperimentByIdentiferValidator.java       |  3 +-
 .../validator/ExperimentValidator.java        |  3 +-
 .../validator/ExpressionValidator.java        |  3 +-
 .../validator/ExternalDataValidator.java      |  3 +-
 .../validator/ICollectionValidator.java       |  3 +-
 .../authorization/validator/IValidator.java   |  3 +-
 .../validator/MatchingEntityValidator.java    |  3 +-
 .../ProjectByIdentiferValidator.java          |  3 +-
 .../validator/ProjectValidator.java           |  3 +-
 .../validator/SampleByIdentiferValidator.java |  3 +-
 .../SamplePropertyAccessValidator.java        | 15 ++++
 .../validator/SampleValidator.java            |  3 +-
 .../SearchDomainSearchResultValidator.java    |  3 +-
 .../SimpleSpaceOrProjectValidator.java        |  3 +-
 .../validator/SimpleSpaceValidator.java       |  3 +-
 .../validator/SpaceValidator.java             |  3 +-
 .../StorageConfirmedForAdminValidator.java    |  3 +-
 .../server/batch/AbstractBatchOperation.java  |  3 +-
 .../batch/AbstractBatchOperationDelegate.java |  3 +-
 .../server/batch/BatchOperationExecutor.java  | 15 ++++
 .../server/batch/DataSetBatchUpdate.java      |  3 +-
 .../batch/DataSetCheckBeforeBatchUpdate.java  |  3 +-
 .../generic/server/batch/IBatchOperation.java |  3 +-
 .../server/batch/IBatchOperationDelegate.java |  3 +-
 .../generic/server/batch/IProgressAware.java  |  3 +-
 .../server/batch/SampleBatchRegistration.java |  3 +-
 .../server/batch/SampleBatchUpdate.java       |  3 +-
 .../server/batch/SampleCheckBeforeUpdate.java |  3 +-
 .../generic/server/batch/SampleUpdate.java    |  3 +-
 .../business/DataStoreServiceFactory.java     |  3 +-
 .../server/business/DeletionUtils.java        |  3 +-
 .../business/EntityOperationChecker.java      |  3 +-
 .../business/IDataStoreServiceFactory.java    |  3 +-
 .../business/IEntityOperationChecker.java     |  3 +-
 .../business/IPropertiesBatchManager.java     |  3 +-
 .../server/business/IRelationshipService.java |  3 +-
 ...ServiceConversationClientManagerLocal.java |  3 +-
 ...ServiceConversationServerManagerLocal.java |  3 +-
 .../PropertiesBatchEvaluationErrors.java      |  3 +-
 .../business/PropertiesBatchManager.java      |  3 +-
 .../server/business/RelationshipService.java  |  3 +-
 .../business/bo/AbstractBusinessObject.java   |  3 +-
 .../bo/AbstractBusinessObjectFactory.java     |  3 +-
 .../bo/AbstractDataSetBusinessObject.java     |  3 +-
 .../bo/AbstractMaterialBusinessObject.java    |  3 +-
 .../bo/AbstractSampleBusinessObject.java      |  3 +-
 ...bstractSampleIdentifierBusinessObject.java |  3 +-
 .../server/business/bo/AttachmentBO.java      |  3 +-
 .../business/bo/AuthorizationGroupBO.java     |  3 +-
 .../server/business/bo/CorePluginTable.java   |  3 +-
 .../bo/DataAccessExceptionTranslator.java     |  3 +-
 .../generic/server/business/bo/DataBO.java    |  3 +-
 .../server/business/bo/DataSetTable.java      |  3 +-
 .../server/business/bo/DataStoreBO.java       |  3 +-
 .../business/bo/DeletedDataSetTable.java      | 15 ++++
 .../server/business/bo/DeletionTable.java     |  3 +-
 .../business/bo/EntityCodeGenerator.java      |  3 +-
 .../business/bo/EntityObjectIdHelper.java     |  3 +-
 .../server/business/bo/EntityTypeBO.java      |  3 +-
 .../business/bo/EntityTypePropertyTypeBO.java |  3 +-
 .../server/business/bo/ExperimentBO.java      |  3 +-
 .../server/business/bo/ExperimentTable.java   |  3 +-
 .../business/bo/GridCustomColumnBO.java       |  3 +-
 .../business/bo/GridCustomFilterBO.java       |  3 +-
 .../bo/IAbstractBussinessObjectFactory.java   |  3 +-
 .../server/business/bo/IAttachmentBO.java     |  3 +-
 .../business/bo/IAuthorizationGroupBO.java    |  3 +-
 .../server/business/bo/IBusinessObject.java   |  3 +-
 .../bo/ICommonBusinessObjectFactory.java      |  3 +-
 .../server/business/bo/ICorePluginTable.java  |  3 +-
 .../generic/server/business/bo/IDataBO.java   |  3 +-
 .../server/business/bo/IDataSetTable.java     |  3 +-
 .../server/business/bo/IDataStoreBO.java      |  3 +-
 .../business/bo/IDeletedDataSetTable.java     |  3 +-
 .../server/business/bo/IDeletionTable.java    |  3 +-
 .../bo/IDynamicPropertiesUpdateChecker.java   |  3 +-
 .../business/bo/IEntityBusinessObject.java    |  3 +-
 .../server/business/bo/IEntityTypeBO.java     |  3 +-
 .../bo/IEntityTypePropertyTypeBO.java         |  3 +-
 .../server/business/bo/IExperimentBO.java     |  3 +-
 .../server/business/bo/IExperimentTable.java  |  3 +-
 .../business/bo/IExternalDataTable.java       |  3 +-
 .../bo/IGridCustomFilterOrColumnBO.java       |  3 +-
 .../server/business/bo/IMaterialBO.java       |  3 +-
 .../server/business/bo/IMaterialTable.java    |  3 +-
 .../server/business/bo/IMetaprojectBO.java    |  3 +-
 .../server/business/bo/IProjectBO.java        |  3 +-
 .../server/business/bo/IPropertyTypeBO.java   |  3 +-
 .../business/bo/IPropertyTypeTable.java       |  3 +-
 .../business/bo/IRoleAssignmentTable.java     |  3 +-
 .../generic/server/business/bo/ISampleBO.java |  3 +-
 .../server/business/bo/ISampleTable.java      |  3 +-
 .../generic/server/business/bo/IScriptBO.java |  3 +-
 .../business/bo/ISearchDomainSearcher.java    |  3 +-
 .../generic/server/business/bo/ISpaceBO.java  |  3 +-
 .../generic/server/business/bo/ITrashBO.java  |  3 +-
 .../server/business/bo/IVocabularyBO.java     |  3 +-
 .../server/business/bo/IVocabularyTermBO.java |  3 +-
 .../bo/InternalPropertyTypeAuthorization.java | 15 ++++
 .../bo/InternalVocabularyAuthorization.java   | 15 ++++
 .../server/business/bo/MaterialBO.java        |  3 +-
 .../server/business/bo/MaterialTable.java     |  3 +-
 .../server/business/bo/MetaprojectBO.java     |  3 +-
 ...etToSampleExperimentAssignmentManager.java |  3 +-
 ...tExceptionFallbackExceptionTranslator.java |  3 +-
 .../generic/server/business/bo/ProjectBO.java |  3 +-
 .../server/business/bo/PropertyTypeBO.java    |  3 +-
 .../server/business/bo/PropertyTypeTable.java |  3 +-
 .../business/bo/RoleAssignmentTable.java      |  3 +-
 .../business/bo/RootEntitiesFinder.java       |  3 +-
 .../generic/server/business/bo/SampleBO.java  |  3 +-
 .../bo/SampleCodeGeneratorByType.java         |  3 +-
 .../bo/SampleCodeGeneratorForTempCodes.java   |  3 +-
 .../bo/SampleGenericBusinessRules.java        |  3 +-
 .../business/bo/SampleHierarchyFiller.java    |  3 +-
 .../server/business/bo/SampleTable.java       |  3 +-
 .../generic/server/business/bo/ScriptBO.java  |  3 +-
 .../business/bo/SearchDomainSearcher.java     |  3 +-
 .../generic/server/business/bo/SpaceBO.java   |  3 +-
 .../generic/server/business/bo/TrashBO.java   |  3 +-
 .../server/business/bo/VocabularyBO.java      |  3 +-
 .../server/business/bo/VocabularyTermBO.java  |  3 +-
 .../bo/common/AbstractBatchIterator.java      |  3 +-
 .../business/bo/common/AbstractDAO.java       |  3 +-
 .../bo/common/BaseEntityPropertyRecord.java   | 15 ++++
 .../server/business/bo/common/CodeRecord.java | 15 ++++
 .../bo/common/DatabaseContextUtils.java       |  3 +-
 .../bo/common/EntityPropertiesEnricher.java   |  3 +-
 .../common/GenericEntityPropertyRecord.java   | 15 ++++
 .../bo/common/IEntityPropertiesEnricher.java  |  3 +-
 .../IEntityPropertiesHolderResolver.java      |  3 +-
 .../IEntityPropertySetListingQuery.java       |  3 +-
 .../bo/common/IPropertyListingQuery.java      |  3 +-
 .../common/MaterialEntityPropertyRecord.java  | 15 ++++
 .../common/PropertyTypeDataObjectBinding.java | 15 ++++
 .../bo/common/SampleEntityPropertyRecord.java | 15 ++++
 .../bo/common/VocabularyTermRecord.java       | 15 ++++
 .../bo/common/entity/AbstractLister.java      |  3 +-
 .../ExperimentProjectSpaceCodeRecord.java     | 15 ++++
 .../entity/ISecondaryEntityListingQuery.java  |  3 +-
 .../common/entity/SampleReferenceRecord.java  |  3 +-
 .../bo/common/entity/SecondaryEntityDAO.java  |  3 +-
 .../bo/datasetlister/ContentCopyRecord.java   | 15 ++++
 .../bo/datasetlister/DataSetTypeRecord.java   | 15 ++++
 .../bo/datasetlister/DataStoreRecord.java     |  3 +-
 .../DatasetCodeWithShareIdRecord.java         | 15 ++++
 .../bo/datasetlister/DatasetLister.java       |  3 +-
 .../bo/datasetlister/DatasetListerDAO.java    |  3 +-
 .../DatasetLocationNodeRecord.java            |  3 +-
 .../bo/datasetlister/DatasetRecord.java       | 15 ++++
 .../datasetlister/DatasetRelationRecord.java  |  3 +-
 .../datasetlister/DatasetVersionRecord.java   |  3 +-
 .../ExternalDataManagementSystemRecord.java   |  3 +-
 .../bo/datasetlister/IDatasetLister.java      |  3 +-
 .../datasetlister/IDatasetListingQuery.java   |  3 +-
 ...taSetDeletionDisallowedTypesException.java |  3 +-
 ...aSetDeletionUnknownLocationsException.java |  3 +-
 .../EntityMetaprojectRelationRecord.java      |  3 +-
 .../common/MetaProjectWithEntityId.java       |  3 +-
 .../common/MetaprojectCreator.java            |  3 +-
 .../common/MetaprojectRecord.java             |  3 +-
 .../fetchoptions/common/PropertyRecord.java   |  3 +-
 .../datasetlister/DataSetDownloadRecord.java  |  3 +-
 .../datasetlister/DataSetLister.java          |  3 +-
 .../datasetlister/DataSetRecord.java          |  3 +-
 .../datasetlister/DataSetRelationRecord.java  |  3 +-
 .../datasetlister/IDataSetLister.java         |  3 +-
 .../datasetlister/IDataSetListingQuery.java   |  3 +-
 .../experimentlister/ExperimentLister.java    |  3 +-
 .../experimentlister/ExperimentRecord.java    |  3 +-
 .../experimentlister/IExperimentLister.java   |  3 +-
 .../IExperimentListingQuery.java              |  3 +-
 .../samplelister/ISampleLister.java           |  3 +-
 .../samplelister/ISampleListingQuery.java     |  3 +-
 .../samplelister/SampleLister.java            |  3 +-
 .../samplelister/SampleRecord.java            |  3 +-
 .../SampleRelationshipRecord.java             |  3 +-
 .../EntityInformationProvider.java            |  3 +-
 .../bo/materiallister/IMaterialLister.java    |  3 +-
 .../materiallister/IMaterialListingQuery.java |  3 +-
 .../bo/materiallister/MaterialLister.java     |  3 +-
 .../bo/materiallister/MaterialListerDAO.java  |  3 +-
 .../bo/materiallister/MaterialRecord.java     | 15 ++++
 .../bo/samplelister/ISampleLister.java        |  3 +-
 .../bo/samplelister/ISampleListingQuery.java  |  3 +-
 .../bo/samplelister/SampleLister.java         |  3 +-
 .../bo/samplelister/SampleListerDAO.java      |  3 +-
 .../bo/samplelister/SampleListingWorker.java  |  3 +-
 .../bo/samplelister/SampleRecord.java         | 15 ++++
 .../bo/samplelister/SampleRelationRecord.java |  3 +-
 .../bo/samplelister/SampleVersionRecord.java  |  3 +-
 .../bo/util/DataSetRegistrationCache.java     |  3 +-
 .../DataSetTypeWithoutExperimentChecker.java  |  3 +-
 .../server/business/bo/util/DataSetUtils.java |  3 +-
 .../server/business/bo/util/SampleOwner.java  | 15 ++++
 .../business/bo/util/SampleOwnerFinder.java   |  3 +-
 .../server/business/bo/util/SampleUtils.java  |  3 +-
 .../business/importer/DatabaseInstance.java   |  3 +-
 .../importer/DatabaseInstanceImporter.java    |  3 +-
 .../business/importer/IDatabaseDumper.java    |  3 +-
 .../server/business/importer/Parameters.java  |  3 +-
 .../search/AbstractSearchManager.java         |  3 +-
 .../business/search/DataSetSearchManager.java |  3 +-
 .../search/ExperimentSearchManager.java       |  3 +-
 .../search/MaterialSearchManager.java         |  3 +-
 .../business/search/SampleSearchManager.java  |  3 +-
 .../search/sort/IEntitySearchResult.java      |  2 +-
 .../search/sort/ISearchResultSorter.java      |  2 +-
 .../sort/SearchResultSorterByScore.java       |  2 +-
 .../server/coreplugin/AsCorePluginPaths.java  |  3 +-
 .../coreplugin/CorePluginRegistrator.java     |  3 +-
 ...njectingPropertyPlaceholderConfigurer.java |  3 +-
 .../coreplugin/JettyWebAppPluginInjector.java |  3 +-
 ...ataStoreServerBasedDataSourceProvider.java |  3 +-
 .../DynamicPropertyEvaluationOperation.java   |  3 +-
 .../DynamicPropertyEvaluationScheduler.java   |  3 +-
 .../dataaccess/EntityPropertiesConverter.java |  3 +-
 .../HibernateInterceptorsWrapper.java         |  3 +-
 .../server/dataaccess/IAttachmentDAO.java     |  3 +-
 .../dataaccess/IAuthorizationDAOFactory.java  |  3 +-
 .../dataaccess/IAuthorizationGroupDAO.java    |  3 +-
 .../server/dataaccess/ICorePluginDAO.java     |  3 +-
 .../server/dataaccess/IDAOFactory.java        |  3 +-
 .../generic/server/dataaccess/IDataDAO.java   |  3 +-
 .../server/dataaccess/IDataSetTypeDAO.java    |  3 +-
 .../dataaccess/IDataSourceProvider.java       |  3 +-
 .../server/dataaccess/IDataStoreDAO.java      |  3 +-
 .../IDataStoreDataSourceManager.java          |  3 +-
 .../server/dataaccess/IDeletionDAO.java       |  3 +-
 .../IDynamicPropertyEvaluationScheduler.java  |  3 +-
 ...cPropertyEvaluationSchedulerWithQueue.java |  3 +-
 .../server/dataaccess/IEntityHistoryDAO.java  |  3 +-
 .../dataaccess/IEntityOperationsLogDAO.java   | 15 ++++
 .../IEntityPropertiesConverter.java           |  3 +-
 .../dataaccess/IEntityPropertyTypeDAO.java    |  3 +-
 .../server/dataaccess/IEntityTypeDAO.java     |  3 +-
 .../generic/server/dataaccess/IEventDAO.java  |  3 +-
 .../server/dataaccess/IEventsSearchDAO.java   |  3 +-
 .../server/dataaccess/IExperimentDAO.java     |  3 +-
 .../server/dataaccess/IExternalDataDAO.java   |  3 +-
 .../IExternalDataManagementSystemDAO.java     |  3 +-
 .../server/dataaccess/IFileFormatTypeDAO.java |  3 +-
 .../server/dataaccess/IGenericDAO.java        |  3 +-
 .../dataaccess/IGridCustomColumnDAO.java      |  3 +-
 .../dataaccess/IGridCustomFilterDAO.java      |  3 +-
 .../dataaccess/IHibernateSearchDAO.java       |  3 +-
 .../server/dataaccess/ILocatorTypeDAO.java    |  3 +-
 .../server/dataaccess/IMaterialDAO.java       |  3 +-
 .../server/dataaccess/IMetaprojectDAO.java    |  3 +-
 .../dataaccess/IOperationExecutionDAO.java    |  3 +-
 .../generic/server/dataaccess/IPersonDAO.java |  3 +-
 .../dataaccess/IPersonalAccessTokenDAO.java   | 15 ++++
 .../dataaccess/IPostRegistrationDAO.java      | 15 ++++
 .../server/dataaccess/IProjectDAO.java        |  3 +-
 .../IPropertyPlaceholderCreator.java          |  3 +-
 .../server/dataaccess/IPropertyTypeDAO.java   |  3 +-
 .../dataaccess/IPropertyValueValidator.java   |  3 +-
 .../generic/server/dataaccess/IQueryDAO.java  |  3 +-
 .../dataaccess/IRelationshipTypeDAO.java      |  3 +-
 .../server/dataaccess/IRoleAssignmentDAO.java |  3 +-
 .../generic/server/dataaccess/ISampleDAO.java |  3 +-
 .../server/dataaccess/ISampleTypeDAO.java     |  3 +-
 .../generic/server/dataaccess/IScriptDAO.java |  3 +-
 .../dataaccess/ISemanticAnnotationDAO.java    |  3 +-
 .../generic/server/dataaccess/ISpaceDAO.java  |  3 +-
 .../server/dataaccess/IVocabularyDAO.java     |  3 +-
 .../server/dataaccess/IVocabularyTermDAO.java |  3 +-
 .../dataaccess/PersistencyResources.java      |  3 +-
 .../PlaceholderPropertyCreator.java           |  3 +-
 .../server/dataaccess/PropertyValidator.java  |  3 +-
 .../dataaccess/RelatedEntityFinder.java       |  3 +-
 .../server/dataaccess/RelationshipUtils.java  |  3 +-
 .../server/dataaccess/db/AbstractDAO.java     |  3 +-
 .../db/AbstractGenericEntityDAO.java          |  3 +-
 ...bstractGenericEntityWithPropertiesDAO.java |  3 +-
 .../server/dataaccess/db/AbstractTypeDAO.java |  3 +-
 .../server/dataaccess/db/AttachmentDAO.java   |  3 +-
 .../db/AuthorizationDAOFactory.java           |  3 +-
 .../dataaccess/db/AuthorizationGroupDAO.java  |  3 +-
 .../server/dataaccess/db/CodeSequenceDAO.java |  3 +-
 .../server/dataaccess/db/CorePluginDAO.java   |  3 +-
 .../server/dataaccess/db/DAOFactory.java      |  3 +-
 .../server/dataaccess/db/DAOUtils.java        |  3 +-
 .../generic/server/dataaccess/db/DataDAO.java |  3 +-
 .../server/dataaccess/db/DataSetTypeDAO.java  |  3 +-
 .../server/dataaccess/db/DataStoreDAO.java    |  3 +-
 .../db/DatabaseAndIndexReplacer.java          |  3 +-
 .../dataaccess/db/DatabaseVersionHolder.java  |  3 +-
 .../server/dataaccess/db/DeletionDAO.java     |  3 +-
 .../db/DynamicPropertiesInterceptor.java      |  3 +-
 .../dataaccess/db/EntityHistoryDAO.java       |  3 +-
 .../dataaccess/db/EntityOperationsLogDAO.java | 15 ++++
 .../dataaccess/db/EntityPropertyTypeDAO.java  |  3 +-
 .../db/EntityResolverQueryFactory.java        |  3 +-
 .../server/dataaccess/db/EntityTypeDAO.java   |  5 +-
 .../db/EntityValidationInterceptor.java       |  3 +-
 .../server/dataaccess/db/EventDAO.java        |  3 +-
 .../server/dataaccess/db/EventsSearchDAO.java |  3 +-
 .../server/dataaccess/db/ExperimentDAO.java   |  3 +-
 .../db/ExternalDataManagementSystemDAO.java   |  3 +-
 .../dataaccess/db/FileFormatTypeDAO.java      |  3 +-
 .../dataaccess/db/GridCustomColumnDAO.java    |  3 +-
 .../dataaccess/db/GridCustomFilterDAO.java    |  3 +-
 .../db/HibernateSearchDAOV3Adaptor.java       | 15 ++++
 .../db/HibernateSearchDataProvider.java       |  3 +-
 .../dataaccess/db/ICodeSequenceDAO.java       |  3 +-
 .../server/dataaccess/db/IDeletionQuery.java  |  3 +-
 .../db/IDetachedCriteriaFactory.java          |  3 +-
 .../dataaccess/db/IEntityResolverQuery.java   |  3 +-
 .../server/dataaccess/db/IPermIdDAO.java      |  3 +-
 .../generic/server/dataaccess/db/InQuery.java | 15 ++++
 .../server/dataaccess/db/InQueryScroller.java | 15 ++++
 .../dataaccess/db/IndexCreationUtil.java      |  3 +-
 .../server/dataaccess/db/LocatorTypeDAO.java  |  3 +-
 .../server/dataaccess/db/MaterialDAO.java     |  3 +-
 .../server/dataaccess/db/MetaprojectDAO.java  |  3 +-
 .../dataaccess/db/MetaprojectSearch.java      |  3 +-
 .../OpenBISHibernateTransactionManager.java   |  3 +-
 .../dataaccess/db/OperationExecutionDAO.java  |  3 +-
 .../server/dataaccess/db/PermIdDAO.java       |  3 +-
 .../server/dataaccess/db/PersonDAO.java       |  3 +-
 .../dataaccess/db/PersonalAccessTokenDAO.java | 15 ++++
 .../dataaccess/db/PostRegistrationDAO.java    | 15 ++++
 .../server/dataaccess/db/ProjectDAO.java      |  3 +-
 .../server/dataaccess/db/PropertyTypeDAO.java |  3 +-
 .../server/dataaccess/db/QueryDAO.java        |  3 +-
 .../dataaccess/db/RelationshipTypeDAO.java    |  3 +-
 .../dataaccess/db/RoleAssignmentDAO.java      |  3 +-
 .../server/dataaccess/db/SampleDAO.java       |  3 +-
 .../SampleDataAccessExceptionTranslator.java  |  3 +-
 .../dataaccess/db/SampleRelationshipDAO.java  | 15 ++++
 .../server/dataaccess/db/SampleTypeDAO.java   |  3 +-
 .../server/dataaccess/db/ScriptDAO.java       |  3 +-
 .../dataaccess/db/SemanticAnnotationDAO.java  |  3 +-
 .../dataaccess/db/SequenceNameMapper.java     |  3 +-
 .../db/SessionsUpdateInterceptor.java         |  3 +-
 .../server/dataaccess/db/SpaceDAO.java        |  3 +-
 .../server/dataaccess/db/VocabularyDAO.java   |  3 +-
 .../dataaccess/db/VocabularyTermDAO.java      |  3 +-
 .../db/deletion/AttachmentEntry.java          |  3 +-
 .../db/deletion/AttributeEntry.java           |  3 +-
 .../db/deletion/EntityHistoryCreator.java     | 15 ++++
 .../db/deletion/EntityModification.java       | 15 ++++
 .../db/deletion/PropertyHistoryEntry.java     | 15 ++++
 .../db/deletion/RelationshipHistoryEntry.java | 15 ++++
 .../SampleUniqueCodeViolationException.java   |  3 +-
 ...eUniqueCodeViolationExceptionAbstract.java |  3 +-
 ...SampleUniqueSubcodeViolationException.java |  3 +-
 .../DefaultBatchDynamicPropertyEvaluator.java |  3 +-
 .../DynamicPropertyEvaluationRunnable.java    |  3 +-
 .../DynamicPropertyEvaluator.java             |  3 +-
 .../IBatchDynamicPropertyEvaluator.java       |  3 +-
 .../IDynamicPropertyCalculatorFactory.java    |  3 +-
 .../IDynamicPropertyEvaluator.java            |  3 +-
 .../calculator/AbstractEntityAdaptor.java     |  3 +-
 .../calculator/BasicPropertyAdaptor.java      |  3 +-
 .../calculator/DynamicPropertyAdaptor.java    |  3 +-
 .../DynamicPropertyCalculatorFactory.java     |  3 +-
 .../calculator/DynamicPropertyFunctions.java  |  3 +-
 .../calculator/EntityAdaptorFactory.java      |  3 +-
 .../calculator/EntityAdaptorIterator.java     |  3 +-
 .../EntityAdaptorRelationsLoader.java         |  3 +-
 .../calculator/EntityTypeRecord.java          |  3 +-
 .../calculator/ExperimentAdaptor.java         |  3 +-
 .../calculator/ExternalDataAdaptor.java       |  3 +-
 .../ExternalDataAdaptorRelationsLoader.java   |  3 +-
 .../IExternalDataAdaptorRelationsQuery.java   |  3 +-
 .../calculator/INonAbstractEntityAdapter.java |  3 +-
 .../ISampleAdaptorRelationsQuery.java         |  3 +-
 .../JythonDynamicPropertyCalculator.java      |  3 +-
 .../JythonEntityValidationCalculator.java     |  3 +-
 .../calculator/MaterialAdaptor.java           |  3 +-
 .../calculator/SampleAdaptor.java             |  3 +-
 .../SampleAdaptorRelationsLoader.java         |  3 +-
 .../calculator/ScrollableResultsIterator.java |  3 +-
 .../calculator/XmlPropertyAdaptor.java        |  3 +-
 .../calculator/api/IDataAdaptor.java          |  3 +-
 .../api/IDynamicPropertyCalculator.java       |  3 +-
 ...amicPropertyCalculatorHotDeployPlugin.java |  3 +-
 .../calculator/api/IExperimentAdaptor.java    |  3 +-
 .../calculator/api/IMaterialAdaptor.java      |  3 +-
 .../calculator/api/ISampleAdaptor.java        |  3 +-
 .../AbstractEntityValidator.java              |  3 +-
 .../EntityValidatorFactory.java               |  3 +-
 .../IEntityValidatorFactory.java              |  3 +-
 .../IEntityValidatorHotDeployPlugin.java      |  3 +-
 .../JythonEntityValidator.java                |  3 +-
 .../api/IEntityValidator.java                 |  3 +-
 .../event/DeleteDataSetEventBuilder.java      |  3 +-
 .../event/DeleteDataSetEventParser.java       |  3 +-
 .../migration/MigrationStepFrom022To023.java  |  3 +-
 .../migration/MigrationStepFrom023To024.java  |  3 +-
 .../migration/MigrationStepFrom025To026.java  |  3 +-
 .../migration/MigrationStepFrom036To037.java  |  3 +-
 .../migration/MigrationStepFrom046To047.java  |  3 +-
 .../dataaccess/util/KeyExtractorFactory.java  |  3 +-
 .../server/dataaccess/util/UpdateUtils.java   |  3 +-
 .../hotfix/ELNAnnotationsMigration.java       | 15 ++++
 .../hotfix/ELNCollectionTypeMigration.java    | 15 ++++
 .../generic/server/hotfix/ELNFixes.java       | 15 ++++
 .../server/jython/api/v1/DataType.java        |  3 +-
 .../server/jython/api/v1/EntityKind.java      |  3 +-
 .../server/jython/api/v1/IAbstractType.java   |  3 +-
 .../server/jython/api/v1/IDataSetType.java    |  3 +-
 .../jython/api/v1/IDataSetTypeImmutable.java  |  3 +-
 .../server/jython/api/v1/IEntityType.java     |  3 +-
 .../jython/api/v1/IEntityTypeMutable.java     |  3 +-
 .../server/jython/api/v1/IExperimentType.java |  3 +-
 .../api/v1/IExperimentTypeImmutable.java      |  3 +-
 .../api/v1/IExternalDataManagementSystem.java |  3 +-
 ...ExternalDataManagementSystemImmutable.java |  3 +-
 .../server/jython/api/v1/IFileFormatType.java |  3 +-
 .../api/v1/IFileFormatTypeImmutable.java      |  3 +-
 .../v1/IMasterDataRegistrationService.java    |  3 +-
 .../IMasterDataRegistrationTransaction.java   |  3 +-
 .../server/jython/api/v1/IMaterialType.java   |  3 +-
 .../jython/api/v1/IMaterialTypeImmutable.java |  3 +-
 .../jython/api/v1/IPropertyAssignment.java    |  3 +-
 .../api/v1/IPropertyAssignmentImmutable.java  |  3 +-
 .../server/jython/api/v1/IPropertyType.java   |  3 +-
 .../jython/api/v1/IPropertyTypeImmutable.java |  3 +-
 .../server/jython/api/v1/ISampleType.java     |  3 +-
 .../jython/api/v1/ISampleTypeImmutable.java   |  3 +-
 .../generic/server/jython/api/v1/IScript.java |  3 +-
 .../jython/api/v1/IScriptImmutable.java       |  3 +-
 .../server/jython/api/v1/IVocabulary.java     |  3 +-
 .../jython/api/v1/IVocabularyImmutable.java   |  3 +-
 .../server/jython/api/v1/IVocabularyTerm.java |  3 +-
 .../api/v1/IVocabularyTermImmutable.java      |  3 +-
 .../jython/api/v1/impl/DataSetType.java       |  3 +-
 .../api/v1/impl/DataSetTypeImmutable.java     |  3 +-
 .../api/v1/impl/DataSetTypeWrapper.java       |  3 +-
 .../api/v1/impl/EncapsulatedCommonServer.java |  3 +-
 .../jython/api/v1/impl/ExperimentType.java    |  3 +-
 .../api/v1/impl/ExperimentTypeImmutable.java  |  3 +-
 .../api/v1/impl/ExperimentTypeWrapper.java    |  3 +-
 .../v1/impl/ExternalDataManagementSystem.java |  3 +-
 ...ExternalDataManagementSystemImmutable.java |  3 +-
 .../ExternalDataManagementSystemWrapper.java  |  3 +-
 .../jython/api/v1/impl/FileFormatType.java    |  3 +-
 .../api/v1/impl/FileFormatTypeImmutable.java  |  3 +-
 .../api/v1/impl/FileFormatTypeWrapper.java    |  3 +-
 .../IMasterDataScriptRegistrationRunner.java  |  3 +-
 .../impl/MasterDataRegistrationException.java |  3 +-
 .../v1/impl/MasterDataRegistrationHelper.java |  3 +-
 .../MasterDataRegistrationScriptRunner.java   |  3 +-
 ...ataRegistrationScriptRunnerStandalone.java |  3 +-
 .../impl/MasterDataRegistrationService.java   |  3 +-
 .../MasterDataRegistrationTransaction.java    |  3 +-
 .../v1/impl/MasterDataTransactionErrors.java  |  3 +-
 .../jython/api/v1/impl/MaterialType.java      |  3 +-
 .../api/v1/impl/MaterialTypeImmutable.java    |  3 +-
 .../api/v1/impl/MaterialTypeWrapper.java      |  3 +-
 .../api/v1/impl/PropertyAssignment.java       |  3 +-
 .../v1/impl/PropertyAssignmentImmutable.java  |  3 +-
 .../v1/impl/PropertyAssignmentWrapper.java    |  3 +-
 .../jython/api/v1/impl/PropertyType.java      |  3 +-
 .../api/v1/impl/PropertyTypeImmutable.java    |  3 +-
 .../api/v1/impl/PropertyTypeWrapper.java      |  3 +-
 .../server/jython/api/v1/impl/SampleType.java |  3 +-
 .../api/v1/impl/SampleTypeImmutable.java      |  3 +-
 .../jython/api/v1/impl/SampleTypeWrapper.java |  3 +-
 .../server/jython/api/v1/impl/Script.java     |  3 +-
 .../jython/api/v1/impl/ScriptHelper.java      |  3 +-
 .../jython/api/v1/impl/ScriptImmutable.java   |  3 +-
 .../jython/api/v1/impl/ScriptWrapper.java     |  3 +-
 .../server/jython/api/v1/impl/Vocabulary.java |  3 +-
 .../api/v1/impl/VocabularyImmutable.java      |  3 +-
 .../jython/api/v1/impl/VocabularyTerm.java    |  3 +-
 .../api/v1/impl/VocabularyTermImmutable.java  |  3 +-
 .../jython/api/v1/impl/VocabularyWrapper.java |  3 +-
 ...rsonalAccessTokenConfigFromProperties.java | 15 ++++
 .../PersonalAccessTokenConverterFromDAO.java  | 15 ++++
 ...ssTokenOpenBisSessionManagerDecorator.java | 15 ++++
 ...ersonalAccessTokenValidityWarningTask.java | 15 ++++
 .../server/plugin/AbstractPluginRegistry.java |  3 +-
 .../plugin/DataSetServerPluginRegistry.java   |  3 +-
 .../server/plugin/IDataSetServerPlugin.java   |  3 +-
 .../plugin/IDataSetTypeSlaveServerPlugin.java |  3 +-
 .../server/plugin/ISampleServerPlugin.java    |  3 +-
 .../plugin/ISampleTypeSlaveServerPlugin.java  |  3 +-
 .../generic/server/plugin/IServerPlugin.java  |  3 +-
 .../plugin/IServerPluginWithWildcards.java    |  3 +-
 .../plugin/SampleServerPluginRegistry.java    |  3 +-
 .../plugin/WildcardSupportingPluginMap.java   |  3 +-
 .../task/AbstractGroupMaintenanceTask.java    |  3 +-
 .../server/task/ArchivingByRequestTask.java   |  3 +-
 ...SampleRegistrationTempCodeUpdaterTask.java | 15 ++++
 .../task/CacheClearanceMaintenanceTask.java   | 15 ++++
 .../task/DataSetRegistrationSummaryTask.java  |  3 +-
 .../server/task/DemoMaintenanceTask.java      |  3 +-
 ...amicPropertyEvaluationMaintenanceTask.java |  3 +-
 ...ggeredByMaterialChangeMaintenanceTask.java |  3 +-
 .../generic/server/task/IChangedHandler.java  |  3 +-
 .../server/task/MaintenanceTaskUtils.java     |  3 +-
 .../task/MaterialExternalDBSyncTask.java      |  3 +-
 .../server/task/MaterialsMigration.java       | 15 ++++
 .../openbis/generic/server/task/Period.java   |  3 +-
 .../generic/server/task/PeriodType.java       |  3 +-
 ...eUnusedUnofficialTermsMaintenanceTask.java |  3 +-
 .../task/RevokeUserAccessMaintenanceTask.java |  3 +-
 .../task/SessionCleanUpMaintenanceTask.java   |  3 +-
 ...essionWorkspaceCleanUpMaintenanceTask.java |  3 +-
 .../StatisticsCollectionMaintenanceTask.java  |  3 +-
 .../server/task/UsageAndGroupsInfo.java       |  3 +-
 .../generic/server/task/UsageGatherer.java    |  3 +-
 .../generic/server/task/UsageInfo.java        |  3 +-
 .../server/task/UsageReportingTask.java       |  3 +-
 .../generic/server/task/UserGroup.java        |  3 +-
 .../task/UserManagementMaintenanceTask.java   |  3 +-
 .../generic/server/task/UserManager.java      |  3 +-
 .../server/task/UserManagerConfig.java        |  3 +-
 .../server/task/UserManagerReport.java        |  3 +-
 .../AttachmentDeletionProcessor.java          | 15 ++++
 .../DataSetDeletionProcessor.java             | 15 ++++
 .../server/task/events_search/DataSource.java | 15 ++++
 .../events_search/DeletionEventProcessor.java | 15 ++++
 .../task/events_search/EventProcessor.java    | 15 ++++
 .../EventsSearchMaintenanceTask.java          |  3 +-
 .../ExperimentDeletionProcessor.java          | 15 ++++
 .../events_search/GenericEventProcessor.java  | 15 ++++
 .../task/events_search/IDataSource.java       | 15 ++++
 .../task/events_search/LastTimestamps.java    | 15 ++++
 .../server/task/events_search/NewEvent.java   | 15 ++++
 .../ProjectDeletionProcessor.java             | 15 ++++
 .../SampleDeletionProcessor.java              | 15 ++++
 .../server/task/events_search/Snapshot.java   | 15 ++++
 .../server/task/events_search/Snapshots.java  | 15 ++++
 .../task/events_search/SnapshotsFacade.java   | 15 ++++
 .../events_search/SpaceDeletionProcessor.java | 15 ++++
 .../server/task/events_search/Statistics.java | 15 ++++
 .../server/util/LifeCycleListener.java        |  3 +-
 .../server/util/MethodInvocationUtils.java    |  3 +-
 .../server/util/OpenbisWebAppProvider.java    |  3 +-
 .../generic/server/util/PluginUtils.java      |  3 +-
 .../server/util/SpaceIdentifierHelper.java    |  3 +-
 .../shared/AbstractOpenBisServiceFactory.java |  3 +-
 .../generic/shared/AbstractServerLogger.java  |  3 +-
 .../openbis/generic/shared/Constants.java     |  3 +-
 .../DatabaseCreateOrDeleteModification.java   |  3 +-
 .../shared/DatabaseUpdateModification.java    |  3 +-
 .../openbis/generic/shared/ICommonServer.java |  3 +-
 .../generic/shared/ICustomImportService.java  |  3 +-
 .../generic/shared/IDataStoreService.java     |  3 +-
 .../generic/shared/IEntityImportService.java  |  3 +-
 .../generic/shared/IJythonEvaluatorPool.java  |  3 +-
 .../shared/IOpenBisSessionManager.java        |  3 +-
 .../generic/shared/IRemoteHostValidator.java  |  3 +-
 .../cisd/openbis/generic/shared/IServer.java  |  3 +-
 .../shared/IServiceForDataStoreServer.java    |  3 +-
 .../generic/shared/ISessionProvider.java      |  3 +-
 .../shared/ISessionWorkspaceProvider.java     |  3 +-
 .../generic/shared/ITrackingServer.java       |  3 +-
 .../shared/LogMessagePrefixGenerator.java     |  3 +-
 .../generic/shared/OpenBisServiceFactory.java |  3 +-
 .../shared/OpenBisServiceV3Factory.java       |  3 +-
 .../openbis/generic/shared/ResourceNames.java |  3 +-
 .../shared/SessionWorkspaceProvider.java      |  3 +-
 .../WebClientConfigurationProvider.java       |  3 +-
 .../shared/api/v1/IWebInformationService.java |  3 +-
 .../generic/shared/api/v1/Translator.java     |  3 +-
 ...icJsonClassValueToClassObjectsMapping.java |  3 +-
 .../api/v1/json/GenericObjectMapper.java      |  3 +-
 .../json/JsonBaseTypeToSubTypesMapping.java   |  3 +-
 .../api/v1/json/ObjectMapperResource.java     |  3 +-
 .../authorization/AuthorizationConfig.java    |  3 +-
 .../AuthorizationConfigFacade.java            |  3 +-
 .../AuthorizationConfigProperties.java        |  3 +-
 .../authorization/IAuthorizationConfig.java   |  3 +-
 .../IAuthorizationConfigProperties.java       |  3 +-
 .../basic/AttachmentDownloadConstants.java    |  3 +-
 .../AttributeSearchFieldKindProvider.java     |  3 +-
 .../generic/shared/basic/BasicConstant.java   |  3 +-
 .../basic/BasicEntityInformationHolder.java   |  3 +-
 .../generic/shared/basic/BasicURLEncoder.java |  3 +-
 .../generic/shared/basic/CodeConverter.java   |  3 +-
 .../generic/shared/basic/CodeNormalizer.java  |  3 +-
 .../shared/basic/DataSetUploadInfo.java       |  3 +-
 .../basic/DatasetImageOverviewUtilities.java  |  3 +-
 .../generic/shared/basic/DeletionUtils.java   |  3 +-
 .../shared/basic/EntityOperationsState.java   |  3 +-
 .../EntityVisitComparatorByTimeStamp.java     | 15 ++++
 .../generic/shared/basic/ExpressionUtil.java  |  3 +-
 .../shared/basic/GenericSharedConstants.java  |  3 +-
 .../shared/basic/GridCustomColumnValue.java   |  3 +-
 .../generic/shared/basic/GridRowModel.java    |  3 +-
 .../shared/basic/IAttachmentHolder.java       |  3 +-
 .../shared/basic/IColumnDefinition.java       |  3 +-
 .../shared/basic/IDeletionProvider.java       |  3 +-
 .../basic/IEntityInformationHolder.java       |  3 +-
 ...EntityInformationHolderWithIdentifier.java |  3 +-
 .../IEntityInformationHolderWithPermId.java   |  3 +-
 ...EntityInformationHolderWithProperties.java |  3 +-
 .../basic/IEntityWithDeletionInformation.java |  3 +-
 .../generic/shared/basic/IIdentityHolder.java |  3 +-
 .../openbis/generic/shared/basic/IIsStub.java |  3 +-
 ...anagedPropertyGridInformationProvider.java |  3 +-
 .../generic/shared/basic/IPermIdHolder.java   |  3 +-
 .../basic/IReportInformationProvider.java     |  3 +-
 .../basic/ITableModelTransformation.java      |  3 +-
 .../generic/shared/basic/ITaggable.java       |  3 +-
 .../shared/basic/IdentifierExtractor.java     |  3 +-
 .../shared/basic/MaterialCodeConverter.java   |  3 +-
 .../generic/shared/basic/MetaprojectName.java |  3 +-
 .../basic/MetaprojectNameConstants.java       |  3 +-
 .../shared/basic/PermlinkUtilities.java       |  3 +-
 .../generic/shared/basic/PrimitiveValue.java  |  3 +-
 .../shared/basic/SearchlinkUtilities.java     |  3 +-
 .../shared/basic/SessionConstants.java        |  3 +-
 .../shared/basic/SimpleDateRenderer.java      |  3 +-
 .../shared/basic/SimpleImageHtmlRenderer.java |  3 +-
 .../shared/basic/SimplePersonRenderer.java    |  3 +-
 .../shared/basic/SimpleYesNoRenderer.java     |  3 +-
 .../generic/shared/basic/TableCellUtil.java   |  3 +-
 .../shared/basic/TableModelAppender.java      |  3 +-
 .../shared/basic/URLMethodWithParameters.java |  3 +-
 .../shared/basic/ValidationUtilities.java     |  3 +-
 .../generic/shared/basic/ViewMode.java        |  3 +-
 .../shared/basic/WebAppProperties.java        |  3 +-
 .../shared/basic/WebAppsProperties.java       |  3 +-
 .../shared/basic/WildcardSupportingMap.java   |  3 +-
 .../shared/basic/annotation/DoNotEscape.java  |  3 +-
 .../basic/dto/AbstractEntityProperty.java     |  3 +-
 .../shared/basic/dto/AbstractExpression.java  |  3 +-
 .../dto/AbstractExpressionWithParameters.java |  3 +-
 .../basic/dto/AbstractExternalData.java       |  3 +-
 .../basic/dto/AbstractProjectUpdates.java     |  3 +-
 .../shared/basic/dto/AbstractType.java        |  3 +-
 .../basic/dto/ArchiverDataSetCriteria.java    |  3 +-
 .../basic/dto/ArchivingServiceKind.java       |  3 +-
 .../basic/dto/AssociatedEntityKind.java       |  3 +-
 .../dto/AsyncBatchRegistrationResult.java     |  3 +-
 .../generic/shared/basic/dto/Attachment.java  |  3 +-
 .../basic/dto/AttachmentHolderKind.java       |  3 +-
 .../shared/basic/dto/AttachmentVersions.java  |  3 +-
 .../basic/dto/AttachmentWithContent.java      |  3 +-
 .../shared/basic/dto/AuthorizationGroup.java  |  3 +-
 .../basic/dto/AuthorizationGroupUpdates.java  |  3 +-
 .../shared/basic/dto/BasicDataSetUpdates.java |  3 +-
 .../basic/dto/BasicEntityDescription.java     |  3 +-
 .../shared/basic/dto/BasicEntityType.java     |  3 +-
 .../basic/dto/BasicExperimentUpdates.java     |  3 +-
 .../basic/dto/BasicMetaprojectUpdates.java    |  3 +-
 .../basic/dto/BasicProjectIdentifier.java     |  3 +-
 .../shared/basic/dto/BasicSampleUpdates.java  |  3 +-
 .../shared/basic/dto/BatchOperationKind.java  |  3 +-
 .../basic/dto/BatchRegistrationResult.java    |  3 +-
 .../shared/basic/dto/CodeAndLabel.java        |  3 +-
 .../shared/basic/dto/ColumnSetting.java       |  3 +-
 ...nAttributeSearchFieldKindDecsriptions.java |  5 +-
 .../shared/basic/dto/CommonGridIDs.java       |  3 +-
 .../generic/shared/basic/dto/CompareType.java |  3 +-
 .../shared/basic/dto/ContainerDataSet.java    |  3 +-
 .../generic/shared/basic/dto/CorePlugin.java  |  3 +-
 .../shared/basic/dto/CustomImport.java        |  3 +-
 .../shared/basic/dto/CustomImportFile.java    |  3 +-
 .../basic/dto/DataSetArchivingStatus.java     |  3 +-
 .../dto/DataSetAttributeSearchFieldKind.java  |  3 +-
 .../basic/dto/DataSetBatchUpdateDetails.java  |  3 +-
 .../generic/shared/basic/dto/DataSetKind.java |  3 +-
 .../basic/dto/DataSetRelatedEntities.java     |  3 +-
 .../basic/dto/DataSetRelationshipRole.java    |  3 +-
 .../generic/shared/basic/dto/DataSetType.java |  3 +-
 .../basic/dto/DataSetTypePropertyType.java    |  3 +-
 .../dto/DataSetTypeWithVocabularyTerms.java   |  3 +-
 .../shared/basic/dto/DataSetUpdateResult.java |  3 +-
 .../generic/shared/basic/dto/DataStore.java   |  3 +-
 .../basic/dto/DataStoreServiceKind.java       |  3 +-
 .../generic/shared/basic/dto/DataType.java    |  3 +-
 .../basic/dto/DatabaseModificationKind.java   |  3 +-
 .../shared/basic/dto/DatasetLocation.java     |  3 +-
 .../shared/basic/dto/DatasetLocationNode.java |  3 +-
 .../dto/DatastoreServiceDescription.java      |  3 +-
 .../shared/basic/dto/DateTableCell.java       |  3 +-
 .../shared/basic/dto/DeletedDataSet.java      |  3 +-
 .../basic/dto/DeletedDataSetLocation.java     |  3 +-
 .../shared/basic/dto/DeletedEntity.java       |  3 +-
 .../generic/shared/basic/dto/Deletion.java    |  3 +-
 .../shared/basic/dto/DeletionType.java        |  3 +-
 .../basic/dto/DetailViewConfiguration.java    |  3 +-
 .../basic/dto/DetailedSearchCriteria.java     |  3 +-
 .../basic/dto/DetailedSearchCriterion.java    |  4 +-
 .../shared/basic/dto/DetailedSearchField.java |  3 +-
 .../basic/dto/DetailedSearchFieldKind.java    |  3 +-
 .../basic/dto/DetailedSearchSubCriteria.java  |  3 +-
 .../shared/basic/dto/DisplaySettings.java     |  3 +-
 .../shared/basic/dto/DoubleTableCell.java     |  3 +-
 .../shared/basic/dto/DssLinkTableCell.java    |  3 +-
 .../dto/DynamicPropertyEvaluationInfo.java    |  3 +-
 .../shared/basic/dto/EntityHistory.java       |  3 +-
 .../basic/dto/EntityKindAndTypeCode.java      |  3 +-
 .../shared/basic/dto/EntityProperty.java      |  3 +-
 .../shared/basic/dto/EntityReference.java     |  3 +-
 .../shared/basic/dto/EntityTableCell.java     |  3 +-
 .../generic/shared/basic/dto/EntityType.java  |  3 +-
 .../basic/dto/EntityTypePropertyType.java     |  3 +-
 .../dto/EntityValidationEvaluationInfo.java   |  3 +-
 .../generic/shared/basic/dto/EntityVisit.java |  3 +-
 .../generic/shared/basic/dto/Experiment.java  |  3 +-
 .../ExperimentAttributeSearchFieldKind.java   |  3 +-
 .../dto/ExperimentBatchUpdateDetails.java     |  3 +-
 .../basic/dto/ExperimentFetchOption.java      |  3 +-
 .../basic/dto/ExperimentFetchOptions.java     |  3 +-
 .../shared/basic/dto/ExperimentType.java      |  3 +-
 .../basic/dto/ExperimentTypePropertyType.java |  3 +-
 .../basic/dto/ExperimentUpdateResult.java     |  3 +-
 .../shared/basic/dto/ExperimentUpdates.java   |  3 +-
 .../basic/dto/ExternalDataLocationNode.java   |  3 +-
 .../shared/basic/dto/FileFormatType.java      |  3 +-
 .../basic/dto/FileSystemContentCopy.java      | 15 ++++
 .../basic/dto/GeneratedImageTableCell.java    |  3 +-
 .../basic/dto/GenericEntityProperty.java      |  3 +-
 .../generic/shared/basic/dto/Grantee.java     |  3 +-
 .../shared/basic/dto/GridCustomColumn.java    |  3 +-
 .../shared/basic/dto/GridCustomFilter.java    |  3 +-
 .../basic/dto/IAttributeSearchFieldKind.java  |  3 +-
 .../shared/basic/dto/IContentCopy.java        | 15 ++++
 .../shared/basic/dto/IDatasetLocation.java    |  3 +-
 .../basic/dto/IDatasetLocationNode.java       |  3 +-
 .../basic/dto/IDeletedDataSetLocation.java    |  3 +-
 .../basic/dto/IEntityPropertiesHolder.java    |  3 +-
 .../shared/basic/dto/IEntityProperty.java     |  3 +-
 .../shared/basic/dto/IExpressionUpdates.java  |  3 +-
 .../shared/basic/dto/IPropertiesBean.java     |  3 +-
 .../basic/dto/IPropertyTypeUpdates.java       |  3 +-
 .../shared/basic/dto/IScriptUpdates.java      |  3 +-
 .../basic/dto/ISearchFieldAvailability.java   |  3 +-
 .../dto/ISearchFieldCriterionFactory.java     |  3 +-
 .../shared/basic/dto/ISearchFieldKind.java    |  3 +-
 .../basic/dto/ISerializableComparable.java    |  3 +-
 .../shared/basic/dto/ISpaceUpdates.java       |  3 +-
 .../generic/shared/basic/dto/Identifier.java  |  3 +-
 .../shared/basic/dto/ImageResolutionKind.java |  3 +-
 .../shared/basic/dto/ImageTableCell.java      |  3 +-
 .../shared/basic/dto/IntegerTableCell.java    |  3 +-
 .../basic/dto/LastModificationState.java      |  3 +-
 .../generic/shared/basic/dto/LinkDataSet.java |  3 +-
 .../shared/basic/dto/LinkDataSetLocation.java |  3 +-
 .../shared/basic/dto/LinkDataSetUrl.java      |  3 +-
 .../generic/shared/basic/dto/LinkModel.java   |  3 +-
 .../shared/basic/dto/LinkTableCell.java       |  3 +-
 .../dto/ListDataSetByPropertyCriteria.java    |  3 +-
 .../basic/dto/ListMaterialCriteria.java       |  3 +-
 .../basic/dto/ListOrSearchSampleCriteria.java |  3 +-
 .../shared/basic/dto/ListSampleCriteria.java  |  3 +-
 .../generic/shared/basic/dto/LocatorType.java |  3 +-
 ...ManagedComboBoxInputWidgetDescription.java |  3 +-
 .../basic/dto/ManagedEntityProperty.java      |  3 +-
 .../dto/ManagedHtmlWidgetDescription.java     |  3 +-
 .../dto/ManagedInputWidgetDescription.java    |  3 +-
 ...edMultilineTextInputWidgetDescription.java |  3 +-
 .../shared/basic/dto/ManagedProperty.java     |  3 +-
 .../dto/ManagedTableWidgetDescription.java    |  3 +-
 .../ManagedTextInputWidgetDescription.java    |  3 +-
 .../basic/dto/ManagedUiActionDescription.java |  3 +-
 .../ManagedUiActionDescriptionFactory.java    |  3 +-
 .../basic/dto/ManagedUiDescription.java       |  3 +-
 .../dto/ManagedUiTableActionDescription.java  |  3 +-
 .../shared/basic/dto/MatchingEntity.java      |  3 +-
 .../basic/dto/MatchingEntityTableCell.java    |  3 +-
 .../generic/shared/basic/dto/Material.java    |  3 +-
 .../dto/MaterialAttributeSearchFieldKind.java |  3 +-
 .../dto/MaterialBatchUpdateResultMessage.java |  3 +-
 .../basic/dto/MaterialEntityProperty.java     |  3 +-
 .../shared/basic/dto/MaterialIdentifier.java  |  3 +-
 .../shared/basic/dto/MaterialType.java        |  3 +-
 .../basic/dto/MaterialTypePropertyType.java   |  3 +-
 .../basic/dto/MetaprojectAssignments.java     |  3 +-
 .../dto/MetaprojectAssignmentsCount.java      |  3 +-
 .../MetaprojectAssignmentsFetchOption.java    |  3 +-
 .../basic/dto/MetaprojectAssignmentsIds.java  |  3 +-
 .../shared/basic/dto/MetaprojectCriteria.java |  3 +-
 .../shared/basic/dto/NewAttachment.java       |  3 +-
 .../basic/dto/NewAuthorizationGroup.java      |  3 +-
 .../shared/basic/dto/NewBasicExperiment.java  |  3 +-
 .../shared/basic/dto/NewColumnOrFilter.java   |  3 +-
 .../generic/shared/basic/dto/NewDataSet.java  |  3 +-
 .../basic/dto/NewDataSetsWithTypes.java       |  3 +-
 .../basic/dto/NewETNewPTAssigments.java       | 15 ++++
 .../shared/basic/dto/NewETPTAssignment.java   |  3 +-
 .../basic/dto/NewEntitiesWithTypes.java       |  3 +-
 .../shared/basic/dto/NewExperiment.java       |  3 +-
 .../basic/dto/NewExperimentsWithType.java     |  3 +-
 .../shared/basic/dto/NewExpression.java       |  3 +-
 .../generic/shared/basic/dto/NewMaterial.java |  3 +-
 .../shared/basic/dto/NewMaterialWithType.java |  3 +-
 .../basic/dto/NewMaterialsWithTypes.java      |  3 +-
 .../shared/basic/dto/NewMetaproject.java      |  3 +-
 .../shared/basic/dto/NewPTNewAssigment.java   | 15 ++++
 .../generic/shared/basic/dto/NewProject.java  |  3 +-
 .../generic/shared/basic/dto/NewSample.java   |  3 +-
 .../shared/basic/dto/NewSamplesWithTypes.java |  3 +-
 .../generic/shared/basic/dto/NewSpace.java    |  3 +-
 .../shared/basic/dto/NewVocabulary.java       |  3 +-
 .../generic/shared/basic/dto/Null.java        |  3 +-
 .../shared/basic/dto/ParameterValue.java      |  3 +-
 .../shared/basic/dto/ParameterWithValue.java  | 15 ++++
 .../shared/basic/dto/PersonAdapter.java       |  3 +-
 .../generic/shared/basic/dto/PersonRole.java  |  3 +-
 .../generic/shared/basic/dto/PersonRoles.java |  3 +-
 .../shared/basic/dto/PersonTableCell.java     |  3 +-
 .../shared/basic/dto/PhysicalDataSet.java     |  3 +-
 .../shared/basic/dto/PlaceholderDataSet.java  |  3 +-
 .../generic/shared/basic/dto/PluginType.java  |  3 +-
 .../basic/dto/PortletConfiguration.java       |  3 +-
 .../generic/shared/basic/dto/Project.java     |  3 +-
 .../shared/basic/dto/ProjectUpdates.java      |  3 +-
 .../shared/basic/dto/PropertyMatch.java       | 15 ++++
 .../shared/basic/dto/PropertyType.java        |  3 +-
 .../basic/dto/PropertyTypeWithVocabulary.java |  3 +-
 .../shared/basic/dto/PropertyUpdates.java     |  3 +-
 .../generic/shared/basic/dto/QueryType.java   |  3 +-
 .../dto/RealNumberFormatingParameters.java    |  3 +-
 .../shared/basic/dto/RelationshipType.java    |  3 +-
 .../shared/basic/dto/ReportRowModel.java      |  3 +-
 .../shared/basic/dto/ReportingPluginType.java |  3 +-
 .../shared/basic/dto/RoleAssignment.java      |  3 +-
 .../shared/basic/dto/RoleWithHierarchy.java   |  3 +-
 .../generic/shared/basic/dto/Sample.java      |  3 +-
 .../dto/SampleAttributeSearchFieldKind.java   |  3 +-
 .../basic/dto/SampleBatchUpdateDetails.java   |  3 +-
 .../basic/dto/SampleEntityProperty.java       |  3 +-
 .../basic/dto/SampleParentWithDerived.java    |  3 +-
 .../generic/shared/basic/dto/SampleType.java  |  3 +-
 .../basic/dto/SampleTypePropertyType.java     |  3 +-
 .../shared/basic/dto/SampleUpdateResult.java  |  3 +-
 .../generic/shared/basic/dto/Script.java      |  3 +-
 .../generic/shared/basic/dto/ScriptType.java  |  3 +-
 .../shared/basic/dto/ScriptUpdateResult.java  |  3 +-
 .../basic/dto/SearchCriteriaConnection.java   |  3 +-
 ...earchDomainSearchResultWithFullEntity.java |  3 +-
 .../dto/SearchFieldAvailableForAdmins.java    |  3 +-
 .../SearchFieldBooleanCriterionFactory.java   |  3 +-
 .../dto/SearchFieldDateCriterionFactory.java  |  3 +-
 .../SerializableComparableIDDecorator.java    |  3 +-
 .../dto/SimpleAttributeSearchFieldKind.java   |  3 +-
 .../generic/shared/basic/dto/SortInfo.java    |  3 +-
 .../generic/shared/basic/dto/SourceType.java  |  2 +-
 .../generic/shared/basic/dto/Space.java       |  3 +-
 .../generic/shared/basic/dto/Span.java        | 15 ++++
 .../basic/dto/StandardPortletNames.java       |  3 +-
 .../shared/basic/dto/StringTableCell.java     |  3 +-
 .../generic/shared/basic/dto/TableModel.java  |  3 +-
 .../basic/dto/TableModelColumnHeader.java     |  3 +-
 .../shared/basic/dto/TableModelRow.java       |  3 +-
 .../basic/dto/TableModelRowWithObject.java    |  3 +-
 .../basic/dto/TrackingDataSetCriteria.java    |  3 +-
 .../basic/dto/TrackingSampleCriteria.java     |  3 +-
 .../dto/TypedTableGridColumnDefinition.java   | 15 ++++
 .../shared/basic/dto/TypedTableModel.java     |  3 +-
 .../basic/dto/UpdatedBasicExperiment.java     |  3 +-
 .../shared/basic/dto/UpdatedDataSet.java      |  3 +-
 .../basic/dto/UpdatedExperimentsWithType.java |  3 +-
 .../shared/basic/dto/UpdatedSample.java       |  3 +-
 .../basic/dto/UpdatedVocabularyTerm.java      |  3 +-
 .../shared/basic/dto/UrlContentCopy.java      | 15 ++++
 .../dto/VocabularyTermBatchUpdateDetails.java |  3 +-
 .../dto/VocabularyTermEntityProperty.java     |  3 +-
 .../basic/dto/VocabularyTermGridIDs.java      |  3 +-
 .../basic/dto/VocabularyTermReplacement.java  |  3 +-
 .../basic/dto/VocabularyTermTableCell.java    |  3 +-
 .../basic/dto/VocabularyTermWithStats.java    |  3 +-
 .../generic/shared/basic/dto/WebApp.java      |  3 +-
 .../shared/basic/dto/WebAppContext.java       |  3 +-
 .../shared/basic/dto/WebAppProperty.java      |  3 +-
 .../basic/dto/WebClientConfiguration.java     |  3 +-
 .../api/IManagedInputWidgetDescription.java   |  3 +-
 ...IManagedInputWidgetDescriptionFactory.java |  3 +-
 .../api/IManagedOutputWidgetDescription.java  |  3 +-
 .../basic/dto/api/IManagedProperty.java       |  3 +-
 .../basic/dto/api/IManagedUiAction.java       |  3 +-
 .../basic/dto/api/IManagedUiDescription.java  |  3 +-
 .../basic/dto/api/IManagedUiTableAction.java  |  3 +-
 .../generic/shared/basic/dto/api/IPerson.java |  3 +-
 .../shared/basic/dto/api/ITableModel.java     |  3 +-
 .../basic/dto/api/ManagedInputFieldType.java  |  3 +-
 .../dto/api/ManagedOutputWidgetType.java      |  3 +-
 .../ManagedTableActionRowSelectionType.java   |  3 +-
 .../basic/dto/api/ValidationException.java    |  3 +-
 .../basic/dto/builders/MaterialBuilder.java   |  3 +-
 .../basic/dto/builders/PropertyBuilder.java   |  3 +-
 .../customcolumn/core/CustomColumnMethod.java |  3 +-
 .../customcolumn/core/CustomColumnParam.java  |  3 +-
 .../extension/link/CustomColumnLinkParam.java |  3 +-
 .../ColumnDisplaySettingsUpdate.java          |  3 +-
 .../IDisplaySettingsUpdate.java               |  3 +-
 .../shared/basic/dto/id/IObjectId.java        |  3 +-
 .../basic/dto/id/ObjectIdentifierId.java      |  3 +-
 .../shared/basic/dto/id/ObjectPermIdId.java   |  3 +-
 .../shared/basic/dto/id/ObjectTechIdId.java   |  3 +-
 .../basic/dto/id/dataset/DataSetCodeId.java   |  3 +-
 .../basic/dto/id/dataset/DataSetTechIdId.java |  3 +-
 .../basic/dto/id/dataset/IDataSetId.java      |  3 +-
 .../dto/id/entitytype/EntityTypePermIdId.java |  3 +-
 .../dto/id/entitytype/IEntityTypeId.java      |  3 +-
 .../id/experiment/ExperimentIdentifierId.java |  3 +-
 .../dto/id/experiment/ExperimentPermIdId.java |  3 +-
 .../dto/id/experiment/ExperimentTechIdId.java |  3 +-
 .../dto/id/experiment/IExperimentId.java      |  3 +-
 .../basic/dto/id/material/IMaterialId.java    |  3 +-
 .../material/MaterialCodeAndTypeCodeId.java   |  3 +-
 .../dto/id/material/MaterialTechIdId.java     |  3 +-
 .../dto/id/metaproject/IMetaprojectId.java    |  3 +-
 .../metaproject/MetaprojectIdentifierId.java  |  3 +-
 .../id/metaproject/MetaprojectTechIdId.java   |  3 +-
 .../basic/dto/id/project/IProjectId.java      |  3 +-
 .../dto/id/project/ProjectIdentifierId.java   |  3 +-
 .../basic/dto/id/project/ProjectPermIdId.java |  3 +-
 .../basic/dto/id/project/ProjectTechIdId.java |  3 +-
 .../shared/basic/dto/id/sample/ISampleId.java |  3 +-
 .../dto/id/sample/SampleIdentifierId.java     |  3 +-
 .../basic/dto/id/sample/SamplePermIdId.java   |  3 +-
 .../basic/dto/id/sample/SampleTechIdId.java   |  3 +-
 .../shared/basic/dto/id/space/ISpaceId.java   |  3 +-
 .../basic/dto/id/space/SpacePermIdId.java     |  3 +-
 .../shared/basic/utils/GroupByMap.java        |  3 +-
 .../basic/utils/IGroupKeyExtractor.java       |  3 +-
 .../shared/calculator/AbstractCalculator.java |  3 +-
 .../shared/calculator/StandardFunctions.java  |  3 +-
 .../customcolumn/CustomColumnJSONBuilder.java |  3 +-
 .../CustomColumnJSONServerData.java           |  3 +-
 .../cli/OpenBisConsoleClientArguments.java    |  3 +-
 ...ConversationApplicationServerClientId.java |  3 +-
 ...rviceConversationApplicationServerUrl.java |  3 +-
 .../ServiceConversationDataStoreClientId.java |  3 +-
 .../ServiceConversationDataStoreUrl.java      |  3 +-
 .../shared/coreplugin/CorePluginScanner.java  |  3 +-
 .../coreplugin/CorePluginsInjector.java       |  3 +-
 .../shared/coreplugin/CorePluginsUtils.java   |  3 +-
 .../coreplugin/ICorePluginResourceLoader.java |  3 +-
 .../shared/coreplugin/IPluginType.java        |  3 +-
 .../coreplugin/ModuleEnabledChecker.java      |  3 +-
 .../generic/shared/coreplugin/PluginType.java |  3 +-
 .../shared/dto/AbstractDeletedEntityPE.java   |  3 +-
 .../shared/dto/AbstractEntityHistoryPE.java   |  3 +-
 .../dto/AbstractEntityPropertyHistoryPE.java  |  3 +-
 .../shared/dto/AbstractExpressionPE.java      |  3 +-
 .../shared/dto/AbstractGridExpressionPE.java  |  3 +-
 .../shared/dto/AbstractIdAndCodeHolder.java   |  3 +-
 .../dto/AbstractRegistrationHolder.java       |  3 +-
 .../generic/shared/dto/AbstractTypePE.java    |  3 +-
 .../dto/AtomicEntityOperationDetails.java     |  3 +-
 .../dto/AtomicEntityOperationResult.java      |  3 +-
 .../shared/dto/AttachmentContentPE.java       |  3 +-
 .../shared/dto/AttachmentHolderPE.java        |  3 +-
 .../generic/shared/dto/AttachmentPE.java      |  3 +-
 .../shared/dto/AuthorizationGroupPE.java      |  3 +-
 .../cisd/openbis/generic/shared/dto/Code.java |  3 +-
 .../generic/shared/dto/ColumnNames.java       |  3 +-
 .../generic/shared/dto/ContentCopyPE.java     | 15 ++++
 .../generic/shared/dto/CorePluginPE.java      |  3 +-
 .../openbis/generic/shared/dto/DataPE.java    |  3 +-
 .../generic/shared/dto/DataSetAccessPE.java   |  3 +-
 .../shared/dto/DataSetBatchUpdatesDTO.java    |  3 +-
 .../generic/shared/dto/DataSetHistoryPE.java  |  3 +-
 .../generic/shared/dto/DataSetPropertyPE.java |  3 +-
 .../shared/dto/DataSetRelationshipId.java     |  3 +-
 .../shared/dto/DataSetRelationshipPE.java     |  3 +-
 .../generic/shared/dto/DataSetShareId.java    |  3 +-
 .../generic/shared/dto/DataSetTypePE.java     |  3 +-
 .../shared/dto/DataSetTypePropertyTypePE.java |  3 +-
 .../generic/shared/dto/DataSetUpdatesDTO.java |  3 +-
 .../shared/dto/DataSetUploadContext.java      |  3 +-
 .../shared/dto/DataSourceDefinition.java      |  3 +-
 .../shared/dto/DataSourceWithDefinition.java  |  3 +-
 .../generic/shared/dto/DataStorePE.java       |  3 +-
 .../shared/dto/DataStoreServerInfo.java       |  3 +-
 .../shared/dto/DataStoreServicePE.java        |  3 +-
 .../generic/shared/dto/DataTypePE.java        |  3 +-
 .../shared/dto/DatasetDescription.java        |  3 +-
 .../dto/DatastoreServiceDescriptions.java     |  3 +-
 .../generic/shared/dto/DeletedDataPE.java     |  3 +-
 .../shared/dto/DeletedExperimentPE.java       |  3 +-
 .../shared/dto/DeletedExternalDataPE.java     |  3 +-
 .../generic/shared/dto/DeletedSamplePE.java   |  3 +-
 .../dto/DeletedSampleRelationshipPE.java      |  3 +-
 .../generic/shared/dto/DeletionPE.java        |  3 +-
 .../EntityCollectionForCreationOrUpdate.java  |  3 +-
 .../dto/EntityOperationsLogEntryPE.java       | 15 ++++
 .../shared/dto/EntityPropertyFiller.java      |  3 +-
 .../generic/shared/dto/EntityPropertyPE.java  |  3 +-
 .../EntityPropertyWithSampleDataTypePE.java   | 15 ++++
 .../generic/shared/dto/EntityTypePE.java      |  3 +-
 .../shared/dto/EntityTypePropertyTypePE.java  |  3 +-
 .../openbis/generic/shared/dto/EventPE.java   |  3 +-
 .../openbis/generic/shared/dto/EventType.java |  3 +-
 .../generic/shared/dto/EventsSearchPE.java    |  3 +-
 .../shared/dto/ExperimentAccessPE.java        |  3 +-
 .../shared/dto/ExperimentBatchUpdatesDTO.java |  3 +-
 .../shared/dto/ExperimentHistoryPE.java       |  3 +-
 .../generic/shared/dto/ExperimentPE.java      |  3 +-
 .../shared/dto/ExperimentPropertyPE.java      |  3 +-
 .../generic/shared/dto/ExperimentTypePE.java  |  3 +-
 .../dto/ExperimentTypePropertyTypePE.java     |  3 +-
 .../shared/dto/ExperimentUpdatesDTO.java      |  3 +-
 .../dto/ExternalDataManagementSystemPE.java   |  3 +-
 .../generic/shared/dto/ExternalDataPE.java    |  3 +-
 .../generic/shared/dto/ExtractableData.java   |  3 +-
 .../generic/shared/dto/FileFormatTypePE.java  |  3 +-
 .../shared/dto/GridCustomColumnPE.java        |  3 +-
 .../shared/dto/GridCustomFilterPE.java        |  3 +-
 .../HibernateAbstractRegistrationHolder.java  |  3 +-
 .../generic/shared/dto/IAuthSession.java      |  3 +-
 .../shared/dto/IAuthSessionProvider.java      |  3 +-
 .../generic/shared/dto/IDeletablePE.java      |  3 +-
 .../dto/IEntityInformationHolderDTO.java      |  3 +-
 ...EntityInformationWithPropertiesHolder.java |  3 +-
 .../shared/dto/IEntityPropertiesHolder.java   |  3 +-
 .../shared/dto/IEntityPropertyHolder.java     |  3 +-
 .../shared/dto/IEntityTypePropertyType.java   |  3 +-
 .../shared/dto/IEntityWithMetaprojects.java   |  3 +-
 .../shared/dto/IEntityWithProperties.java     |  3 +-
 .../generic/shared/dto/IIdAndCodeHolder.java  |  3 +-
 .../generic/shared/dto/IMatchingEntity.java   |  3 +-
 .../shared/dto/IModificationDateBean.java     |  3 +-
 .../dto/IModifierAndModificationDateBean.java |  3 +-
 .../generic/shared/dto/IModifierBean.java     |  3 +-
 .../generic/shared/dto/IRelatedEntity.java    |  3 +-
 .../shared/dto/IRelatedEntityFinder.java      |  3 +-
 .../shared/dto/ISampleRelationshipDAO.java    | 15 ++++
 .../shared/dto/IUntypedValueSetter.java       |  3 +-
 .../cisd/openbis/generic/shared/dto/Id.java   |  3 +-
 .../generic/shared/dto/LimitFilter.java       |  3 +-
 .../generic/shared/dto/LinkDataPE.java        |  3 +-
 .../shared/dto/ListSampleCriteriaDTO.java     |  3 +-
 .../dto/ListSamplesByPropertyCriteria.java    |  3 +-
 .../generic/shared/dto/LocationType.java      | 15 ++++
 .../generic/shared/dto/LocatorTypePE.java     |  3 +-
 .../shared/dto/MatchingContentCopy.java       | 15 ++++
 .../generic/shared/dto/MaterialPE.java        |  3 +-
 .../shared/dto/MaterialPropertyHistoryPE.java |  3 +-
 .../shared/dto/MaterialPropertyPE.java        |  3 +-
 .../generic/shared/dto/MaterialTypePE.java    |  3 +-
 .../dto/MaterialTypePropertyTypePE.java       |  3 +-
 .../generic/shared/dto/MaterialUpdateDTO.java | 15 ++++
 .../shared/dto/MetaprojectAssignmentPE.java   |  3 +-
 .../generic/shared/dto/MetaprojectPE.java     |  3 +-
 .../shared/dto/MetaprojectUpdatesDTO.java     |  3 +-
 .../shared/dto/NewContainerDataSet.java       |  3 +-
 .../generic/shared/dto/NewDataSet.java        |  3 +-
 .../generic/shared/dto/NewExternalData.java   |  3 +-
 .../generic/shared/dto/NewLinkDataSet.java    |  3 +-
 .../shared/dto/NewProcessingInstruction.java  |  3 +-
 .../generic/shared/dto/NewProperty.java       |  3 +-
 .../generic/shared/dto/NewPropertyType.java   |  3 +-
 .../generic/shared/dto/NewRoleAssignment.java |  3 +-
 .../shared/dto/NewSampleComponent.java        |  3 +-
 ...wSampleComponentWithFixedMaterialType.java |  3 +-
 .../generic/shared/dto/NewVocabularyTerm.java |  3 +-
 .../shared/dto/OpenBISSessionHolder.java      |  3 +-
 .../dto/OperationExecutionAvailability.java   |  3 +-
 .../shared/dto/OperationExecutionPE.java      |  3 +-
 .../shared/dto/OperationExecutionState.java   |  3 +-
 .../openbis/generic/shared/dto/PermId.java    |  3 +-
 .../shared/dto/PersonDisplaySettingsPE.java   |  3 +-
 .../openbis/generic/shared/dto/PersonPE.java  |  3 +-
 .../shared/dto/PersonalAccessToken.java       | 15 ++++
 .../shared/dto/PersonalAccessTokenHash.java   | 15 ++++
 .../dto/PersonalAccessTokenSession.java       | 15 ++++
 .../shared/dto/PostRegistrationPE.java        | 15 ++++
 .../shared/dto/ProcessingInstructionDTO.java  |  3 +-
 .../shared/dto/ProcessingParameters.java      |  3 +-
 .../openbis/generic/shared/dto/ProjectPE.java |  3 +-
 .../generic/shared/dto/ProjectUpdatesDTO.java |  3 +-
 .../generic/shared/dto/PropertyTypePE.java    |  3 +-
 .../openbis/generic/shared/dto/QueryPE.java   |  3 +-
 .../generic/shared/dto/RelatedDataSet.java    |  3 +-
 .../generic/shared/dto/RelatedEntity.java     |  3 +-
 .../generic/shared/dto/RelatedExperiment.java |  3 +-
 .../shared/dto/RelatedExternalDms.java        |  3 +-
 .../generic/shared/dto/RelatedProject.java    |  3 +-
 .../generic/shared/dto/RelatedSample.java     |  3 +-
 .../generic/shared/dto/RelatedSpace.java      |  3 +-
 .../generic/shared/dto/RelationType.java      |  3 +-
 .../shared/dto/RelationshipTypePE.java        |  3 +-
 .../generic/shared/dto/RoleAssignmentPE.java  |  3 +-
 .../generic/shared/dto/SampleAccessPE.java    |  3 +-
 .../shared/dto/SampleBatchUpdatesDTO.java     |  3 +-
 .../generic/shared/dto/SampleHistoryPE.java   |  3 +-
 .../openbis/generic/shared/dto/SamplePE.java  |  3 +-
 .../dto/SampleParentWithDerivedDTO.java       |  3 +-
 .../generic/shared/dto/SamplePropertyPE.java  |  3 +-
 .../shared/dto/SampleRelationshipPE.java      |  3 +-
 .../dto/SampleRelationshipSkeleton.java       |  3 +-
 .../generic/shared/dto/SampleSkeleton.java    |  3 +-
 .../generic/shared/dto/SampleTypePE.java      |  3 +-
 .../shared/dto/SampleTypePropertyTypePE.java  |  3 +-
 .../generic/shared/dto/SampleUpdatesDTO.java  |  3 +-
 .../openbis/generic/shared/dto/ScriptPE.java  |  3 +-
 .../generic/shared/dto/SearchableEntity.java  |  3 +-
 .../shared/dto/SemanticAnnotationPE.java      |  3 +-
 .../generic/shared/dto/SequenceNames.java     |  3 +-
 .../openbis/generic/shared/dto/Session.java   |  3 +-
 .../generic/shared/dto/SessionContextDTO.java |  3 +-
 .../dto/SimpleDataSetInformationDTO.java      |  3 +-
 .../generic/shared/dto/SimpleSession.java     |  3 +-
 .../openbis/generic/shared/dto/SpacePE.java   |  3 +-
 .../shared/dto/SpaceRoleAssignment.java       |  3 +-
 .../generic/shared/dto/StorageFormat.java     |  3 +-
 .../generic/shared/dto/TableNames.java        |  3 +-
 .../generic/shared/dto/TimeInterval.java      |  3 +-
 .../shared/dto/ValidationMessages.java        |  3 +-
 .../generic/shared/dto/VocabularyPE.java      |  3 +-
 .../generic/shared/dto/VocabularyTermPE.java  |  3 +-
 .../shared/dto/VocabularyTermWithStats.java   |  3 +-
 .../shared/dto/VocabularyUpdatesDTO.java      |  3 +-
 .../AtomicEntityOperationDetailsBuilder.java  |  3 +-
 .../exception/UndefinedSpaceException.java    |  3 +-
 .../shared/dto/hibernate/JsonMapUserType.java |  3 +-
 .../dto/hibernate/JsonPostgreSQLDialect.java  |  3 +-
 .../shared/dto/hibernate/Location.java        |  3 +-
 .../dto/hibernate/LocationValidator.java      |  3 +-
 .../dto/hibernate/ManagedInternally.java      |  3 +-
 .../hibernate/ManagedInternallyValidator.java |  3 +-
 .../shared/dto/hibernate/NullBridge.java      |  3 +-
 .../dto/hibernate/SearchFieldConstants.java   |  3 +-
 .../identifier/AbstractIdentifierFactory.java |  3 +-
 .../dto/identifier/ExperimentIdentifier.java  |  3 +-
 .../ExperimentIdentifierFactory.java          |  3 +-
 .../dto/identifier/IdentifierHelper.java      |  3 +-
 .../identifier/LocalExperimentIdentifier.java |  3 +-
 .../dto/identifier/ProjectIdentifier.java     |  3 +-
 .../identifier/ProjectIdentifierFactory.java  |  3 +-
 .../dto/identifier/SampleIdentifier.java      |  3 +-
 .../identifier/SampleIdentifierFactory.java   |  3 +-
 .../identifier/SampleIdentifierPattern.java   |  3 +-
 .../dto/identifier/SampleOwnerIdentifier.java |  3 +-
 .../dto/identifier/SpaceIdentifier.java       |  3 +-
 .../identifier/SpaceIdentifierFactory.java    |  3 +-
 .../shared/dto/properties/EntityKind.java     |  3 +-
 .../shared/dto/types/DataSetTypeCode.java     |  3 +-
 .../shared/dto/types/ExperimentTypeCode.java  |  3 +-
 .../shared/dto/types/MaterialTypeCode.java    |  3 +-
 ...onPropertyBasedHotDeployPluginFactory.java |  3 +-
 ...onPropertyBasedHotDeployPluginFactory.java |  3 +-
 .../ICommonPropertyBasedHotDeployPlugin.java  |  3 +-
 .../hotdeploy_plugins/api/IEntityAdaptor.java |  3 +-
 .../api/IEntityPropertyAdaptor.java           |  3 +-
 .../EntityLinkElementTranslator.java          |  3 +-
 .../managed_property/IAtomicEvaluation.java   |  3 +-
 .../managed_property/IEvaluationRunner.java   |  3 +-
 .../IManagedPropertyEvaluatorFactory.java     |  3 +-
 .../JythonManagedPropertyEvaluator.java       |  3 +-
 .../ManagedPropertyEvaluatorFactory.java      |  3 +-
 .../ManagedPropertyFunctions.java             | 15 ++++
 .../SimpleTableModelBuilderAdaptor.java       |  3 +-
 .../api/EntityLinkElementKind.java            |  3 +-
 .../shared/managed_property/api/IElement.java |  3 +-
 .../managed_property/api/IElementFactory.java |  3 +-
 .../api/IEntityInformationProvider.java       |  3 +-
 .../api/IEntityLinkElement.java               |  3 +-
 .../api/IManagedPropertyEvaluator.java        |  3 +-
 .../IManagedPropertyHotDeployEvaluator.java   |  3 +-
 .../api/IRowBuilderAdaptor.java               |  3 +-
 .../api/ISimpleTableModelBuilderAdaptor.java  |  3 +-
 .../api/IStructuredPropertyConverter.java     |  3 +-
 .../managed_property/structured/Element.java  |  3 +-
 .../structured/ElementFactory.java            |  3 +-
 .../structured/EntityLinkElement.java         |  3 +-
 .../JsonStructuredPropertyConverter.java      |  3 +-
 .../XmlOrJsonStructuredPropertyConverter.java |  3 +-
 .../XmlStructuredPropertyConverter.java       |  3 +-
 .../shared/parser/BisExcelFileLoader.java     |  3 +-
 .../shared/parser/BisTabFileLoader.java       |  3 +-
 .../shared/parser/ExcelFileSection.java       |  3 +-
 .../generic/shared/parser/FileSection.java    | 15 ++++
 .../shared/parser/GlobalProperties.java       |  3 +-
 .../shared/parser/GlobalPropertiesLoader.java |  3 +-
 .../shared/parser/NamedInputStream.java       |  3 +-
 .../parser/NewSampleParserObjectFactory.java  |  3 +-
 .../parser/SampleUploadSectionsParser.java    |  3 +-
 .../UpdatedSampleParserObjectFactory.java     |  3 +-
 .../AbstractPersonalAccessTokenConverter.java | 15 ++++
 .../pat/IPersonalAccessTokenConfig.java       | 15 ++++
 .../pat/IPersonalAccessTokenConverter.java    | 15 ++++
 .../pat/PersonalAccessTokenConstants.java     | 15 ++++
 ...tractEntityTypePropertyTypeTranslator.java |  3 +-
 .../translator/AttachmentTranslator.java      |  3 +-
 .../AuthorizationGroupTranslator.java         |  3 +-
 .../translator/CorePluginTranslator.java      |  4 +-
 .../shared/translator/DataSetTranslator.java  |  3 +-
 .../DataSetTypePropertyTypeTranslator.java    |  3 +-
 .../translator/DataSetTypeTranslator.java     |  3 +-
 .../DataStoreServiceTranslator.java           |  3 +-
 .../translator/DataStoreTranslator.java       |  3 +-
 .../shared/translator/DataTypeTranslator.java |  3 +-
 .../DatabaseInstanceTranslator.java           |  3 +-
 .../translator/DeletedEntityTranslator.java   |  3 +-
 .../shared/translator/DeletionTranslator.java |  3 +-
 .../shared/translator/DtoConverters.java      |  3 +-
 .../translator/EntityHistoryTranslator.java   |  3 +-
 .../translator/EntityPropertyTranslator.java  |  3 +-
 .../translator/EntityTypeTranslator.java      |  3 +-
 .../translator/ExperimentTranslator.java      |  3 +-
 .../ExperimentTypePropertyTypeTranslator.java |  3 +-
 .../translator/ExperimentTypeTranslator.java  |  3 +-
 ...xternalDataManagementSystemTranslator.java |  3 +-
 .../GridCustomExpressionTranslator.java       |  3 +-
 .../shared/translator/MaterialTranslator.java |  3 +-
 .../MaterialTypePropertyTypeTranslator.java   |  3 +-
 .../translator/MaterialTypeTranslator.java    |  3 +-
 .../translator/MetaprojectTranslator.java     |  3 +-
 .../translator/PersonRolesTranslator.java     |  3 +-
 .../shared/translator/PersonTranslator.java   |  3 +-
 .../shared/translator/ProjectTranslator.java  |  3 +-
 .../translator/PropertyTranslatorUtils.java   |  3 +-
 .../translator/PropertyTypeTranslator.java    |  3 +-
 .../translator/RoleAssignmentTranslator.java  |  3 +-
 .../shared/translator/SampleTranslator.java   |  3 +-
 .../SampleTypePropertyTypeTranslator.java     |  3 +-
 .../translator/SampleTypeTranslator.java      |  3 +-
 .../shared/translator/ScriptTranslator.java   |  3 +-
 .../translator/SimpleDataSetHelper.java       |  3 +-
 .../shared/translator/SpaceTranslator.java    |  3 +-
 .../shared/translator/TypeTranslator.java     |  3 +-
 .../translator/VocabularyTermTranslator.java  |  3 +-
 .../translator/VocabularyTranslator.java      |  4 +-
 .../generic/shared/util/CacheManager.java     |  3 +-
 .../generic/shared/util/DataTypeUtils.java    |  3 +-
 .../DatabaseInstanceIdentifierHelper.java     |  3 +-
 .../DisplaySettingsSerializationUtils.java    |  3 +-
 .../generic/shared/util/EntityHelper.java     |  3 +-
 .../generic/shared/util/EodSqlUtils.java      |  3 +-
 .../generic/shared/util/EqualsHashUtils.java  |  3 +-
 .../generic/shared/util/HibernateUtils.java   |  3 +-
 .../generic/shared/util/HttpRequestUtils.java |  3 +-
 .../generic/shared/util/ICacheManager.java    |  3 +-
 .../openbis/generic/shared/util/IColumn.java  |  3 +-
 .../generic/shared/util/IColumnGroup.java     |  3 +-
 .../generic/shared/util/IColumnMetaData.java  |  3 +-
 .../shared/util/IDataSourceFactory.java       |  2 +-
 .../generic/shared/util/IRowBuilder.java      |  3 +-
 .../cisd/openbis/generic/shared/util/Key.java |  3 +-
 .../util/MaterialConfigurationProvider.java   |  3 +-
 .../shared/util/RelationshipUtils.java        |  3 +-
 .../generic/shared/util/RuntimeCache.java     |  3 +-
 .../util/RuntimeCacheEventListener.java       |  3 +-
 .../RuntimeCacheEventListenerFactory.java     |  3 +-
 .../generic/shared/util/ServerUtils.java      |  3 +-
 .../shared/util/SimplePropertyValidator.java  |  3 +-
 .../shared/util/SimpleTableModelBuilder.java  |  3 +-
 .../generic/shared/util/SpaceCodeHelper.java  |  3 +-
 .../generic/shared/util/StopWatchLogger.java  |  3 +-
 .../shared/util/TypedTableModelBuilder.java   |  3 +-
 .../openbis/generic/shared/util/UuidUtil.java |  3 +-
 .../shared/util/WebClientConfigUtils.java     |  3 +-
 .../shared/util/WebClientFilesUpdater.java    |  3 +-
 .../openbis/generic/shared/util/XmlUtils.java |  3 +-
 .../AbstractPluginBusinessObjectFactory.java  |  3 +-
 .../plugin/AbstractSampleServerPlugin.java    |  3 +-
 .../client/web/client/IDemoClientService.java |  3 +-
 .../web/client/IDemoClientServiceAsync.java   |  3 +-
 .../application/ClientPluginFactory.java      |  3 +-
 .../client/application/DemoSampleViewer.java  |  3 +-
 .../client/application/DemoViewContext.java   | 15 ++++
 .../client/web/client/application/Dict.java   |  3 +-
 .../CustomizedWidgetDemoModuleMenu.java       |  3 +-
 .../client/application/module/DemoModule.java |  3 +-
 .../application/module/StatisticsWidget.java  |  3 +-
 .../module/TopMenuItemDemoModuleMenu.java     |  3 +-
 .../client/web/server/DemoClientService.java  |  3 +-
 .../web/server/DemoClientServiceServlet.java  |  3 +-
 .../server/DemoBusinessObjectFactory.java     |  3 +-
 .../demo/server/DemoSampleServerPlugin.java   |  3 +-
 .../plugin/demo/server/DemoServer.java        |  3 +-
 .../plugin/demo/server/DemoServerLogger.java  |  3 +-
 .../server/IDemoBusinessObjectFactory.java    |  3 +-
 .../plugin/demo/shared/IDemoServer.java       |  3 +-
 .../plugin/demo/shared/ResourceNames.java     |  3 +-
 .../web/client/IGenericClientService.java     |  3 +-
 .../client/IGenericClientServiceAsync.java    |  3 +-
 .../AbstractEntityDataSetsSection.java        |  3 +-
 ...AbstractGenericEntityRegistrationForm.java |  3 +-
 .../application/ClientPluginFactory.java      |  3 +-
 .../application/DelegatedClientPlugin.java    |  3 +-
 .../client/application/GeneralImportForm.java | 15 ++++
 .../application/GenericViewContext.java       | 15 ++++
 .../application/PropertiesPanelUtils.java     |  3 +-
 .../dataset/AbstractDataSetsSection.java      |  3 +-
 .../dataset/DataSetChildrenSection.java       |  3 +-
 .../dataset/DataSetContainedSection.java      |  3 +-
 .../dataset/DataSetContainerSection.java      |  3 +-
 .../dataset/DataSetParentsSection.java        |  3 +-
 .../dataset/DataSetPropertiesPanel.java       |  3 +-
 .../dataset/DataSetPropertyEditor.java        |  3 +-
 .../dataset/DataSetRelationshipBrowser.java   |  3 +-
 .../application/dataset/DataViewSection.java  |  3 +-
 .../GenericDataSetBatchUpdateForm.java        |  3 +-
 .../dataset/GenericDataSetEditForm.java       |  3 +-
 .../dataset/GenericDataSetViewer.java         |  3 +-
 .../dataset/LinkDataSetAnchor.java            |  3 +-
 ...stractExperimentBatchRegistrationForm.java |  3 +-
 ...ractGenericExperimentRegisterEditForm.java |  3 +-
 .../experiment/ExperimentDataSetBrowser.java  |  3 +-
 .../experiment/ExperimentPropertiesPanel.java |  3 +-
 .../experiment/ExperimentPropertyEditor.java  |  3 +-
 .../experiment/ExperimentSamplesArea.java     |  3 +-
 .../experiment/ExperimentSamplesSection.java  |  3 +-
 ...enericExperimentBatchRegistrationForm.java |  3 +-
 .../GenericExperimentBatchUpdateForm.java     |  3 +-
 .../experiment/GenericExperimentEditForm.java |  3 +-
 .../GenericExperimentRegistrationForm.java    |  3 +-
 .../experiment/GenericExperimentViewer.java   |  3 +-
 .../experiment/ManagedPropertyField.java      |  3 +-
 .../experiment/PropertiesEditor.java          |  3 +-
 ...AbstractMaterialBatchRegistrationForm.java |  3 +-
 .../GenericMaterialBatchRegistrationForm.java |  3 +-
 .../GenericMaterialBatchUpdateForm.java       |  3 +-
 .../material/GenericMaterialEditForm.java     |  3 +-
 .../material/GenericMaterialViewer.java       |  3 +-
 .../material/MaterialPropertyEditor.java      |  3 +-
 ...AbstractGenericSampleRegisterEditForm.java |  3 +-
 .../AbstractSampleBatchRegistrationForm.java  |  3 +-
 .../sample/ContainerSamplesSection.java       |  3 +-
 .../sample/DerivedSamplesSection.java         |  3 +-
 .../sample/EntityConnectionTypeProvider.java  |  3 +-
 .../GenericSampleBatchRegistrationForm.java   |  3 +-
 .../sample/GenericSampleBatchUpdateForm.java  |  3 +-
 .../sample/GenericSampleEditForm.java         |  3 +-
 .../sample/GenericSampleRegistrationForm.java |  3 +-
 .../sample/GenericSampleViewer.java           |  3 +-
 .../application/sample/ParentSamplesArea.java |  3 +-
 .../sample/ParentSamplesSection.java          |  3 +-
 .../ParentsPropertiesSectionBuilder.java      |  3 +-
 .../sample/SampleDataSetBrowser.java          |  3 +-
 .../sample/SampleDataSetsSection.java         |  3 +-
 .../sample/SamplePropertyEditor.java          |  3 +-
 .../application/sample/SamplesArea.java       |  3 +-
 .../web/server/AttachmentDownloadServlet.java |  3 +-
 .../client/web/server/DataSetLoader.java      |  2 +-
 .../client/web/server/ExperimentLoader.java   |  3 +-
 .../web/server/GenericClientService.java      |  3 +-
 .../server/GenericClientServiceServlet.java   |  3 +-
 .../client/web/server/MaterialLoader.java     | 15 ++++
 .../web/server/UpdatedExperimentLoader.java   |  3 +-
 ...actBasicExperimentParserObjectFactory.java |  3 +-
 .../parser/MaterialUploadSectionsParser.java  |  3 +-
 ...NewBasicExperimentParserObjectFactory.java |  3 +-
 .../NewMaterialParserObjectFactory.java       |  3 +-
 ...tedBasicExperimentParserObjectFactory.java |  3 +-
 .../UpdatedDataSetParserObjectFactory.java    |  3 +-
 .../server/AbstractGenericServerPlugin.java   |  3 +-
 .../server/DataSetIdentifiersExtractor.java   |  3 +-
 .../server/EntityExistenceChecker.java        |  3 +-
 .../server/ExperimentBatchRegistration.java   | 15 ++++
 .../generic/server/ExperimentBatchUpdate.java | 15 ++++
 .../server/GenericBusinessObjectFactory.java  |  3 +-
 .../server/GenericDataSetServerPlugin.java    |  3 +-
 .../GenericDataSetTypeSlaveServerPlugin.java  |  3 +-
 .../server/GenericSampleServerPlugin.java     |  3 +-
 .../GenericSampleTypeSlaveServerPlugin.java   |  3 +-
 .../plugin/generic/server/GenericServer.java  |  3 +-
 .../generic/server/GenericServerLogger.java   |  3 +-
 .../generic/server/GenericServiceServer.java  |  3 +-
 .../server/IGenericBusinessObjectFactory.java |  3 +-
 .../generic/server/IdentifersExtractor.java   |  3 +-
 .../server/NormalizedSampleIdentifier.java    |  3 +-
 .../plugin/generic/shared/IGenericServer.java |  3 +-
 .../shared/IGenericServerInternal.java        |  3 +-
 .../plugin/generic/shared/ResourceNames.java  |  3 +-
 .../query/client/api/v1/FacadeFactory.java    |  3 +-
 .../query/client/api/v1/IQueryApiFacade.java  |  3 +-
 .../query/client/api/v1/QueryApiFacade.java   |  3 +-
 .../query/client/api/v1/QueryApiTest.java     |  3 +-
 .../web/client/IQueryClientService.java       |  3 +-
 .../web/client/IQueryClientServiceAsync.java  |  3 +-
 .../application/ClientPluginFactory.java      |  3 +-
 .../web/client/application/Constants.java     |  3 +-
 .../client/web/client/application/Dict.java   |  3 +-
 .../application/DisplayTypeIDGenerator.java   |  3 +-
 .../web/client/application/QueryModule.java   |  3 +-
 .../application/QueryParameterValue.java      |  3 +-
 .../client/application/QuerySectionPanel.java |  3 +-
 .../client/application/QueryViewContext.java  |  3 +-
 .../locator/QueryLocatorResolver.java         | 15 ++++
 .../module/AbstractQueryProviderToolbar.java  |  3 +-
 .../application/module/IQueryProvider.java    |  3 +-
 .../application/module/QueryBrowserGrid.java  |  3 +-
 .../module/QueryDatabaseModel.java            |  3 +-
 .../module/QueryDatabaseSelectionWidget.java  |  3 +-
 .../application/module/QueryEditor.java       |  3 +-
 .../client/application/module/QueryModel.java |  3 +-
 .../module/QueryModuleDatabaseMenuItem.java   |  3 +-
 .../module/QuerySelectionWidget.java          |  3 +-
 .../application/module/QueryViewer.java       |  3 +-
 .../module/RunCannedQueryToolbar.java         |  3 +-
 .../module/RunCustomQueryToolbar.java         |  3 +-
 .../application/module/SQLQueryField.java     |  3 +-
 .../client/dto/QueryBrowserGridColumnIDs.java |  3 +-
 .../client/web/server/QueryClientService.java |  3 +-
 .../web/server/QueryClientServiceServlet.java |  3 +-
 .../resultset/QueryExpressionProvider.java    |  3 +-
 .../cisd/openbis/plugin/query/server/DAO.java |  3 +-
 .../openbis/plugin/query/server/IDAO.java     |  3 +-
 .../QueryDatabaseDefinitionProvider.java      |  3 +-
 ...baseDefinitionProviderAutoInitialized.java |  3 +-
 .../plugin/query/server/QueryServer.java      |  3 +-
 .../query/server/QueryServerLogger.java       |  3 +-
 .../query/server/api/v1/QueryApiLogger.java   |  3 +-
 .../query/server/api/v1/QueryApiServer.java   |  3 +-
 .../server/api/v1/QueryServiceJsonServer.java |  3 +-
 .../server/api/v1/QueryServiceServer.java     |  3 +-
 .../query/server/api/v1/ResourceNames.java    |  3 +-
 .../authorization/AuthorizationChecker.java   |  3 +-
 .../authorization/IAuthorizationChecker.java  |  3 +-
 .../authorization/QueryAccessController.java  |  3 +-
 .../resultfilter/DataSetDataLoader.java       |  3 +-
 .../resultfilter/EntityDataLoaderFactory.java |  3 +-
 .../resultfilter/ExperimentDataLoader.java    |  3 +-
 .../resultfilter/IEntityDataLoader.java       |  3 +-
 .../IEntityDataLoaderFactory.java             |  3 +-
 .../resultfilter/QueryResultFilter.java       |  3 +-
 .../resultfilter/SampleDataLoader.java        |  3 +-
 .../query/shared/DatabaseDefinition.java      |  3 +-
 .../IQueryDatabaseDefinitionProvider.java     |  3 +-
 ...baseDefinitionProviderAutoInitialized.java |  3 +-
 .../plugin/query/shared/IQueryServer.java     |  3 +-
 .../plugin/query/shared/ResourceNames.java    |  3 +-
 .../query/shared/api/v1/IQueryApiServer.java  |  3 +-
 .../v1/dto/AggregationServiceDescription.java |  3 +-
 .../api/v1/dto/AggregationServiceType.java    |  3 +-
 .../shared/api/v1/dto/QueryDescription.java   |  3 +-
 .../shared/api/v1/dto/QueryTableColumn.java   |  3 +-
 .../api/v1/dto/QueryTableColumnDataType.java  |  3 +-
 .../shared/api/v1/dto/QueryTableModel.java    |  3 +-
 .../shared/api/v1/dto/ReportDescription.java  |  3 +-
 .../shared/api/v1/dto/TypedStringValue.java   |  3 +-
 .../query/shared/basic/dto/IQueryUpdates.java |  3 +-
 .../query/shared/basic/dto/NewQuery.java      |  3 +-
 .../query/shared/basic/dto/QueryDatabase.java |  3 +-
 .../shared/basic/dto/QueryExpression.java     |  3 +-
 .../basic/dto/QueryParameterBindings.java     |  3 +-
 .../translator/QueryTableModelTranslator.java |  3 +-
 .../shared/translator/QueryTranslator.java    |  3 +-
 .../plugin/query/shared/translator/Util.java  |  3 +-
 .../AbstractApplicationServerApiTestCase.java |  3 +-
 .../asapi/v3/ExperimentServerApiTest.java     |  3 +-
 .../asapi/v3/FetchOptionsToStringTest.java    |  3 +-
 .../server/asapi/v3/SampleServerApiTest.java  |  2 +-
 .../v3/cache/FetchOptionsMatcherTest.java     |  3 +-
 .../asapi/v3/cache/SearchCacheTest.java       |  3 +-
 .../ProgressDetailsToStringBuilderTest.java   | 15 ++++
 .../server/asapi/v3/context/TestClass.java    |  3 +-
 .../v3/executor/AbstractExecutorTest.java     |  3 +-
 .../common/search/cache/CacheFactory.java     | 15 ++++
 .../common/search/cache/CacheTest.java        | 15 ++++
 .../common/search/cache/FileCacheFactory.java | 15 ++++
 .../search/cache/MemoryCacheFactory.java      | 15 ++++
 .../VerifyDataSetContentCopyExecutorTest.java | 15 ++++
 .../MapExperimentByIdExecutorTest.java        |  3 +-
 .../AsynchronousOperationExecutorTest.java    | 15 ++++
 .../SynchronousOperationExecutorTest.java     | 15 ++++
 .../v3/executor/operation/TestAction.java     |  3 +-
 .../v3/executor/operation/TestException.java  |  3 +-
 .../OperationExecutionEmailNotifierTest.java  | 15 ++++
 .../OperationExecutionNotifierTest.java       | 15 ++++
 ...rchObjectsOperationExecutorStressTest.java |  3 +-
 .../SearchObjectsOperationExecutorTest.java   |  3 +-
 .../operation/search/TestSearchOperation.java |  3 +-
 .../search/TestSearchOperationResult.java     |  3 +-
 .../store/OperationExecutionStoreTest.java    | 15 ++++
 .../project/MapProjectByIdExecutorTest.java   |  3 +-
 .../AbstractEntityPropertyExecutorTest.java   |  3 +-
 .../UpdateEntityPropertyExecutorTest.java     |  3 +-
 .../VerifyEntityPropertyExecutorTest.java     |  3 +-
 .../sample/FullSampleIdentifierTest.java      |  3 +-
 .../tag/GetTagIdentifierExecutorTest.java     |  3 +-
 .../executor/tag/MapTagByIdExecutorTest.java  |  3 +-
 .../RoleAssignmentUtilsTest.java              |  3 +-
 .../asapi/v3/helper/sort/SortAndPageTest.java | 15 ++++
 .../v3/translator/TranslationCacheTest.java   | 15 ++++
 .../GlobalSearchObjectTranslatorTest.java     | 15 ++++
 .../AbstractSearchCriteriaTranslatorTest.java |  3 +-
 ...xperimentSearchCriteriaTranslatorTest.java |  3 +-
 .../SampleSearchCriteriaTranslatorTest.java   |  3 +-
 .../v3/json/GenericObjectMapperTest.java      |  3 +-
 .../xls/export/DataSetExpectations.java       | 15 ++++
 .../xls/export/DataSetTypeExpectations.java   | 15 ++++
 .../xls/export/ExperimentExpectations.java    | 15 ++++
 .../export/ExperimentTypeExpectations.java    | 15 ++++
 .../xls/export/ProjectExpectations.java       | 15 ++++
 .../xls/export/PropertyAssignmentFactory.java | 15 ++++
 .../server/xls/export/SampleExpectations.java | 15 ++++
 .../xls/export/SampleTypeExpectations.java    | 15 ++++
 ...ypeWithBareSamplePropertyExpectations.java | 15 ++++
 ...thChainedSamplePropertiesExpectations.java | 15 ++++
 ...ithCyclicSamplePropertiesExpectations.java | 15 ++++
 ...pleTypeWithSamplePropertyExpectations.java | 15 ++++
 ...ypeWithVocabularyPropertyExpectations.java | 15 ++++
 .../server/xls/export/SpaceExpectations.java  | 15 ++++
 .../xls/export/VocabularyExpectations.java    | 15 ++++
 .../server/xls/export/XLSExportTest.java      | 15 ++++
 .../asapi/v3/AbstractDataSetTest.java         | 15 ++++
 .../v3/AbstractDeleteEntityTypeTest.java      |  3 +-
 .../asapi/v3/AbstractDeletionTest.java        |  3 +-
 .../asapi/v3/AbstractExperimentTest.java      | 15 ++++
 .../asapi/v3/AbstractExternalDmsTest.java     | 15 ++++
 .../asapi/v3/AbstractGetEntityTypeTest.java   |  3 +-
 .../asapi/v3/AbstractLinkDataSetTest.java     | 15 ++++
 .../v3/AbstractOperationExecutionTest.java    |  3 +-
 .../v3/AbstractPersonalAccessTokenTest.java   |  3 +-
 .../asapi/v3/AbstractQueryTest.java           |  3 +-
 .../asapi/v3/AbstractSampleTest.java          | 15 ++++
 .../asapi/v3/AbstractSearchPropertyTest.java  |  3 +-
 .../systemtest/asapi/v3/AbstractTest.java     |  2 +-
 .../asapi/v3/AbstractVocabularyTest.java      |  3 +-
 ...ssignDataSetToExperimentAndSampleTest.java |  3 +-
 .../v3/AssignSampleToExperimentTest.java      |  3 +-
 .../asapi/v3/ConfirmDeletionTest.java         |  3 +-
 .../asapi/v3/ContentCopyHistoryTest.java      | 15 ++++
 .../v3/CreateAuthorizationGroupTest.java      |  3 +-
 .../systemtest/asapi/v3/CreateCodesTest.java  |  3 +-
 .../asapi/v3/CreateDataSetTest.java           |  3 +-
 .../asapi/v3/CreateDataSetTypeTest.java       |  3 +-
 .../asapi/v3/CreateEntityTypeTest.java        |  3 +-
 .../asapi/v3/CreateExperimentTest.java        |  3 +-
 .../asapi/v3/CreateExperimentTypeTest.java    |  3 +-
 .../asapi/v3/CreateExternalDmsTest.java       |  3 +-
 .../asapi/v3/CreateLinkDataSetTest.java       | 15 ++++
 .../asapi/v3/CreateMaterialTest.java          |  3 +-
 .../asapi/v3/CreateMaterialTypeTest.java      |  3 +-
 .../systemtest/asapi/v3/CreatePermIdTest.java | 15 ++++
 .../systemtest/asapi/v3/CreatePersonTest.java |  3 +-
 .../v3/CreatePersonalAccessTokenTest.java     |  3 +-
 .../systemtest/asapi/v3/CreatePluginTest.java |  3 +-
 .../asapi/v3/CreateProjectTest.java           |  3 +-
 .../asapi/v3/CreatePropertyTypeTest.java      |  3 +-
 .../systemtest/asapi/v3/CreateQueryTest.java  |  3 +-
 .../asapi/v3/CreateRoleAssignmentTest.java    |  3 +-
 .../systemtest/asapi/v3/CreateSampleTest.java |  3 +-
 .../asapi/v3/CreateSampleTypeTest.java        |  3 +-
 .../v3/CreateSemanticAnnotationTest.java      |  3 +-
 .../systemtest/asapi/v3/CreateSpaceTest.java  |  3 +-
 .../systemtest/asapi/v3/CreateTagTest.java    |  3 +-
 .../asapi/v3/CreateVocabulariesTest.java      |  3 +-
 .../asapi/v3/CreateVocabularyTermTest.java    |  3 +-
 .../v3/DataSetRelationshipHistoryTest.java    |  3 +-
 .../asapi/v3/DataSetSearchPropertyTest.java   |  3 +-
 .../v3/DeleteAuthorizationGroupTest.java      |  3 +-
 .../asapi/v3/DeleteDataSetTest.java           |  3 +-
 .../asapi/v3/DeleteDataSetTypeTest.java       |  3 +-
 .../asapi/v3/DeleteExperimentTest.java        |  3 +-
 .../asapi/v3/DeleteExperimentTypeTest.java    |  3 +-
 .../asapi/v3/DeleteExternalDmsTest.java       |  3 +-
 .../asapi/v3/DeleteMaterialTypeTest.java      |  3 +-
 .../asapi/v3/DeleteMaterialsTest.java         |  3 +-
 .../v3/DeleteOperationExecutionTest.java      |  3 +-
 .../systemtest/asapi/v3/DeletePersonTest.java |  3 +-
 .../v3/DeletePersonalAccessTokenTest.java     |  3 +-
 .../systemtest/asapi/v3/DeletePluginTest.java |  3 +-
 .../asapi/v3/DeleteProjectTest.java           |  3 +-
 .../asapi/v3/DeletePropertyTypesTest.java     |  3 +-
 .../systemtest/asapi/v3/DeleteQueryTest.java  |  3 +-
 .../asapi/v3/DeleteRoleAssignmentTest.java    |  3 +-
 .../systemtest/asapi/v3/DeleteSampleTest.java |  3 +-
 .../asapi/v3/DeleteSampleTypeTest.java        |  3 +-
 .../v3/DeleteSemanticAnnotationTest.java      |  3 +-
 .../systemtest/asapi/v3/DeleteSpaceTest.java  |  3 +-
 .../systemtest/asapi/v3/DeleteTagTest.java    |  3 +-
 .../asapi/v3/DeleteVocabularyTermTest.java    |  3 +-
 .../asapi/v3/DeleteVocabularyTest.java        |  3 +-
 .../asapi/v3/EntityDeletionTest.java          |  3 +-
 .../asapi/v3/EvaluatePluginTest.java          |  3 +-
 .../TestDynamicPropertyHotDeployedPlugin.java | 15 ++++
 ...TestEntityValidationHotDeployedPlugin.java | 15 ++++
 .../asapi/v3/ExecuteOperationsTest.java       |  3 +-
 .../systemtest/asapi/v3/ExecuteQueryTest.java |  3 +-
 .../asapi/v3/ExecuteServiceTest.java          |  3 +-
 .../systemtest/asapi/v3/ExecuteSqlTest.java   |  3 +-
 .../v3/ExperimentRelationshipHistoryTest.java |  3 +-
 .../v3/ExperimentSearchPropertyTest.java      |  3 +-
 .../asapi/v3/GetAuthorizationGroupTest.java   |  3 +-
 .../systemtest/asapi/v3/GetDataSetTest.java   |  3 +-
 .../asapi/v3/GetDataSetTypeTest.java          |  3 +-
 .../asapi/v3/GetExperimentTest.java           |  3 +-
 .../asapi/v3/GetExperimentTypeTest.java       |  3 +-
 .../asapi/v3/GetExternalDmsTest.java          |  3 +-
 .../asapi/v3/GetLinkDataSetTest.java          | 15 ++++
 .../systemtest/asapi/v3/GetMaterialTest.java  |  3 +-
 .../asapi/v3/GetMaterialTypeTest.java         |  3 +-
 .../asapi/v3/GetOperationExecutionTest.java   |  3 +-
 .../systemtest/asapi/v3/GetPersonTest.java    |  3 +-
 .../asapi/v3/GetPersonalAccessTokenTest.java  |  3 +-
 .../systemtest/asapi/v3/GetPluginTest.java    |  3 +-
 .../systemtest/asapi/v3/GetProjectTest.java   |  3 +-
 .../asapi/v3/GetPropertyTypeTest.java         |  3 +-
 .../asapi/v3/GetQueryDatabaseTest.java        |  3 +-
 .../systemtest/asapi/v3/GetQueryTest.java     |  3 +-
 .../systemtest/asapi/v3/GetRightsTest.java    |  3 +-
 .../asapi/v3/GetRoleAssignmentsTest.java      |  3 +-
 .../systemtest/asapi/v3/GetSampleTest.java    |  3 +-
 .../asapi/v3/GetSampleTypeTest.java           |  3 +-
 .../asapi/v3/GetSemanticAnnotationTest.java   |  3 +-
 .../asapi/v3/GetServerInformationTest.java    |  3 +-
 .../v3/GetServerPublicInformationTest.java    |  3 +-
 .../asapi/v3/GetSessionInformationTest.java   | 15 ++++
 .../systemtest/asapi/v3/GetSpaceTest.java     |  3 +-
 .../systemtest/asapi/v3/GetTagTest.java       |  3 +-
 .../asapi/v3/GetVocabulariesTest.java         |  3 +-
 .../asapi/v3/GetVocabularyTermTest.java       |  3 +-
 .../systemtest/asapi/v3/GlobalSearchTest.java |  3 +-
 .../systemtest/asapi/v3/LoginTest.java        | 15 ++++
 .../systemtest/asapi/v3/MethodWrapper.java    |  3 +-
 .../asapi/v3/MixedExecuteOperationsTest.java  |  3 +-
 .../v3/ProjectRelationshipHistoryTest.java    |  3 +-
 .../asapi/v3/ProjectSampleTest.java           |  3 +-
 .../asapi/v3/RevertDeletionTest.java          |  3 +-
 .../v3/SampleRelationshipHistoryTest.java     |  3 +-
 .../asapi/v3/SampleSearchPropertyTest.java    |  3 +-
 .../v3/SearchAuthorizationGroupTest.java      |  3 +-
 .../asapi/v3/SearchDataSetTest.java           |  3 +-
 .../asapi/v3/SearchDataSetTypeTest.java       |  3 +-
 .../asapi/v3/SearchDataStoreTest.java         |  3 +-
 .../asapi/v3/SearchDeletionTest.java          |  3 +-
 .../systemtest/asapi/v3/SearchEventTest.java  |  3 +-
 .../asapi/v3/SearchExperimentTest.java        |  3 +-
 .../asapi/v3/SearchExperimentTypeTest.java    |  3 +-
 .../asapi/v3/SearchExternalDmsTest.java       |  3 +-
 .../asapi/v3/SearchLinkDataSetTest.java       | 15 ++++
 .../asapi/v3/SearchMaterialTest.java          |  3 +-
 .../asapi/v3/SearchMaterialTypeTest.java      |  3 +-
 .../v3/SearchObjectKindModificationTest.java  |  3 +-
 .../systemtest/asapi/v3/SearchPersonTest.java |  3 +-
 .../v3/SearchPersonalAccessTokenTest.java     |  3 +-
 .../systemtest/asapi/v3/SearchPluginTest.java |  3 +-
 .../asapi/v3/SearchProjectTest.java           |  3 +-
 .../v3/SearchPropertyAssignmentTest.java      |  3 +-
 .../asapi/v3/SearchPropertyTypeTest.java      |  3 +-
 .../asapi/v3/SearchQueryDatabaseTest.java     |  3 +-
 .../systemtest/asapi/v3/SearchQueryTest.java  |  3 +-
 .../asapi/v3/SearchRoleAssignmentsTest.java   |  3 +-
 .../systemtest/asapi/v3/SearchSampleTest.java |  3 +-
 .../asapi/v3/SearchSampleTypeTest.java        |  3 +-
 .../v3/SearchSemanticAnnotationTest.java      |  3 +-
 .../asapi/v3/SearchServiceTest.java           |  3 +-
 .../v3/SearchSessionInformationTest.java      | 15 ++++
 .../systemtest/asapi/v3/SearchSpaceTest.java  |  3 +-
 .../systemtest/asapi/v3/SearchTagTest.java    |  3 +-
 .../asapi/v3/SearchVocabularyTermTest.java    |  3 +-
 .../asapi/v3/SearchVocabularyTest.java        |  3 +-
 .../v3/UpdateAuthorizationGroupTest.java      |  3 +-
 .../asapi/v3/UpdateDataSetTest.java           |  3 +-
 .../asapi/v3/UpdateDataSetTypeTest.java       |  3 +-
 .../asapi/v3/UpdateEntityTypeTest.java        |  3 +-
 .../asapi/v3/UpdateExperimentTest.java        |  3 +-
 .../asapi/v3/UpdateExperimentTypeTest.java    |  3 +-
 .../asapi/v3/UpdateExternalDmsTest.java       |  3 +-
 .../asapi/v3/UpdateLinkDataSetTest.java       | 15 ++++
 .../asapi/v3/UpdateMaterialTest.java          |  3 +-
 .../asapi/v3/UpdateMaterialTypeTest.java      |  3 +-
 .../v3/UpdateOperationExecutionTest.java      |  3 +-
 .../systemtest/asapi/v3/UpdatePersonTest.java |  3 +-
 .../v3/UpdatePersonalAccessTokenTest.java     |  3 +-
 .../systemtest/asapi/v3/UpdatePluginTest.java |  3 +-
 .../asapi/v3/UpdateProjectTest.java           |  3 +-
 .../asapi/v3/UpdatePropertyTypesTest.java     |  3 +-
 .../systemtest/asapi/v3/UpdateQueryTest.java  |  3 +-
 .../systemtest/asapi/v3/UpdateSampleTest.java |  3 +-
 .../asapi/v3/UpdateSampleTypeTest.java        |  3 +-
 .../v3/UpdateSemanticAnnotationTest.java      |  3 +-
 .../systemtest/asapi/v3/UpdateSpaceTest.java  |  3 +-
 .../systemtest/asapi/v3/UpdateTagTest.java    |  3 +-
 .../asapi/v3/UpdateVocabulariesTest.java      |  3 +-
 .../asapi/v3/UpdateVocabularyTermTest.java    |  3 +-
 .../systemtest/asapi/v3/util/EmailUtil.java   |  3 +-
 .../systemtest/asapi/v3/util/Operator.java    |  3 +-
 .../openbis/systemtest/deletion/Change.java   | 15 ++++
 .../deletion/DataSetDeletionTest.java         | 15 ++++
 .../systemtest/deletion/DeletionTest.java     | 15 ++++
 .../deletion/ExperimentDeletionTest.java      | 15 ++++
 .../deletion/MaterialDeletionTest.java        | 15 ++++
 .../deletion/ProjectDeletionTest.java         | 15 ++++
 .../deletion/SampleDeletionTest.java          | 15 ++++
 .../freezing/DataSetFreezingTest.java         |  3 +-
 .../freezing/ExperimentFreezingTest.java      |  3 +-
 ...ampleDataSetRelationshipsFreezingTest.java |  3 +-
 .../systemtest/freezing/FreezingTest.java     |  3 +-
 .../systemtest/freezing/FrozenFlags.java      |  3 +-
 ...ctExperimentRelationshipsFreezingTest.java |  3 +-
 .../freezing/ProjectFreezingTest.java         |  3 +-
 .../freezing/SampleFreezingTest.java          |  3 +-
 ...rimentSampleRelationshipsFreezingTest.java |  3 +-
 .../freezing/SpaceFreezingTest.java           |  3 +-
 ...SpaceProjectRelationshipsFreezingTest.java |  3 +-
 .../cisd/openbis/DependencyCheckingTest.java  |  3 +-
 .../openbis/generic/EditingTestSuite1.java    |  3 +-
 .../openbis/generic/EditingTestSuite2.java    |  3 +-
 .../MiscellaneousClientsideCodeTestSuite.java |  3 +-
 .../openbis/generic/OpenbisClientTest.java    | 15 ++++
 .../cisd/openbis/generic/SamplePENoDAO.java   | 15 ++++
 .../openbis/generic/ViewingTestSuite1.java    |  3 +-
 .../openbis/generic/ViewingTestSuite2.java    |  3 +-
 .../openbis/generic/ViewingTestSuite3.java    |  3 +-
 .../generic/client/console/LexerTest.java     |  3 +-
 ...asterDataRegistrationScriptRunnerTest.java |  3 +-
 .../application/AuthenticationTest.java       |  3 +-
 .../application/AuthorizationGroupsTest.java  |  3 +-
 .../AuthorizationManagementConsolTest.java    |  3 +-
 .../client/application/DataSetSearchTest.java |  3 +-
 .../application/DummyAuthenticationTest.java  |  3 +-
 .../application/EntityTypeBrowserTest.java    |  3 +-
 .../EntityTypePropertyTypeAssignmentTest.java |  3 +-
 .../application/ExperimentBrowserTest.java    |  3 +-
 .../application/FileFormatTypeGridTest.java   |  3 +-
 .../application/MaterialBrowserTest.java      |  3 +-
 .../application/ProjectRegistrationTest.java  |  3 +-
 .../PropertyTypeAssignmentBrowserTest.java    |  3 +-
 .../application/PropertyTypeBrowserTest.java  |  3 +-
 .../PropertyTypeRegistrationTest.java         |  3 +-
 .../client/application/SampleBrowserTest.java |  3 +-
 .../web/client/application/SearchCommand.java |  3 +-
 .../web/client/application/SearchTest.java    |  3 +-
 .../web/client/application/TestConstants.java |  3 +-
 .../application/VocabularyBrowserTest.java    |  3 +-
 .../VocabularyRegistrationTest.java           |  3 +-
 .../locator/MaterialCodeUtilsTest.java        |  3 +-
 .../application/locator/OpenViewCommand.java  |  3 +-
 .../ViewLocatorResolverRegistryTest.java      |  3 +-
 .../application/locator/ViewLocatorTest.java  |  3 +-
 .../client/application/ui/ActivateTab.java    |  3 +-
 .../application/ui/CheckTabNotExists.java     |  3 +-
 .../application/ui/InvokeActionMenu.java      |  3 +-
 .../web/client/application/ui/Login.java      |  3 +-
 .../web/client/application/ui/Logout.java     |  3 +-
 .../ui/amc/CheckAuthorizationGroupTable.java  |  3 +-
 .../application/ui/amc/CheckGroupTable.java   |  3 +-
 .../application/ui/amc/CheckPersonTable.java  |  3 +-
 .../ui/amc/CheckRoleAssignmentTable.java      |  3 +-
 .../ui/amc/CreateAuthorizationGroup.java      |  3 +-
 .../application/ui/amc/CreateGroup.java       |  3 +-
 .../application/ui/amc/CreatePerson.java      |  3 +-
 .../application/ui/amc/FillAddPersonForm.java |  3 +-
 .../ui/amc/FillRoleAssignmentForm.java        |  3 +-
 .../ui/amc/OpenAddPersonDialog.java           |  3 +-
 .../ui/amc/OpenRoleAssignmentDialog.java      |  3 +-
 .../application/ui/amc/RemovePerson.java      |  3 +-
 .../application/ui/amc/RoleAssignmentRow.java |  3 +-
 .../ui/amc/ShowAuthorizationGroup.java        |  3 +-
 .../client/application/ui/data/Criterion.java |  3 +-
 .../application/ui/data/ShowDataSet.java      |  3 +-
 .../ui/data/ShowDataSetEditor.java            |  3 +-
 .../ui/data/columns/DataSetRow.java           |  3 +-
 .../ui/data/columns/DataSetSearchRow.java     |  3 +-
 .../ui/experiment/CheckExperimentTable.java   |  3 +-
 .../experiment/ChooseTypeOfNewExperiment.java |  3 +-
 .../ui/experiment/ListExperiments.java        |  3 +-
 .../ui/experiment/ShowExperiment.java         |  3 +-
 .../ui/experiment/ShowExperimentEditor.java   |  3 +-
 .../ui/experiment/columns/ExperimentRow.java  |  3 +-
 .../expressions/filter/AddFilterCommand.java  |  3 +-
 .../filter/ApplyFilterCommand.java            |  3 +-
 .../filter/CheckFiltersTableCommand.java      |  3 +-
 .../filter/OpenFilterSettingsCommand.java     |  3 +-
 .../ui/material/CheckMaterialTable.java       |  3 +-
 .../ui/material/ListMaterials.java            |  3 +-
 .../application/ui/material/MaterialRow.java  |  3 +-
 .../ui/project/CheckProjectTable.java         |  3 +-
 .../project/FillProjectRegistrationForm.java  |  3 +-
 .../CheckPropertyTypeAssignmentTable.java     |  3 +-
 .../property_type/CheckPropertyTypeTable.java |  3 +-
 .../FillPropertyTypeAssignmentForm.java       |  3 +-
 .../FillPropertyTypeRegistrationForm.java     |  3 +-
 .../ui/sample/CheckSampleTable.java           |  3 +-
 .../ui/sample/ChooseTypeOfNewSample.java      |  3 +-
 .../ui/sample/ExportSamplesTestCommand.java   |  3 +-
 .../application/ui/sample/ListSamples.java    |  3 +-
 .../application/ui/sample/ShowSample.java     |  3 +-
 .../ui/sample/columns/SampleRow.java          |  3 +-
 .../ui/search/FillSearchCriteria.java         |  3 +-
 .../application/ui/util/GridTestUtils.java    |  3 +-
 .../FillVocabularyRegistrationForm.java       |  3 +-
 .../WebAppSortingAndCodeComparatorTest.java   |  3 +-
 .../application/ui/webapp/WebAppUrlTest.java  |  3 +-
 .../AbstractDefaultTestCommand.java           |  3 +-
 .../testframework/AbstractGWTTestCase.java    |  3 +-
 .../testframework/AbstractProperty.java       |  3 +-
 .../ChangeTableColumnSettingsCommand.java     |  3 +-
 .../testframework/CheckTableCommand.java      |  3 +-
 .../testframework/FailureExpectation.java     |  3 +-
 .../web/client/testframework/GWTTestUtil.java |  3 +-
 .../testframework/IMessageValidator.java      |  3 +-
 .../web/client/testframework/IProperty.java   |  3 +-
 .../testframework/IPropertyChecker.java       |  3 +-
 .../client/testframework/ITestCommand.java    |  3 +-
 .../client/testframework/IValueAssertion.java |  3 +-
 .../client/testframework/IWidgetHandler.java  |  3 +-
 .../PropertyCheckingManager.java              |  3 +-
 .../client/testframework/RemoteConsole.java   |  3 +-
 .../testframework/RowWithProperties.java      |  3 +-
 .../web/client/testframework/TestUtil.java    |  3 +-
 .../WaitForAllActiveCallbacksFinish.java      |  3 +-
 .../client/testframework/WidgetPicker.java    |  3 +-
 .../DisplaySettingsManagerTest.java           |  3 +-
 .../ExperimentChooserFieldTest.java           |  3 +-
 .../clientnonjs/HelpPageIdentifierTest.java   |  3 +-
 .../web/clientnonjs/URLListEncoderTest.java   |  3 +-
 .../ViewLocatorResolverRegistryTest.java      |  3 +-
 ...ildcardSupportingPluginFactoryMapTest.java |  3 +-
 .../web/server/AbstractClientServiceTest.java |  3 +-
 .../web/server/CommonClientServiceTest.java   |  3 +-
 .../web/server/HelpRedirectServletTest.java   |  3 +-
 .../client/web/server/MessageTest.java        |  3 +-
 .../web/server/UploadServiceServletTest.java  |  3 +-
 .../WebClientConfigurationProviderTest.java   |  3 +-
 .../server/calculator/RowCalculatorTest.java  |  3 +-
 .../client/web/server/calculator/RowTest.java |  3 +-
 .../resultset/AbstractProviderTest.java       |  3 +-
 .../AuthorizationGroupProviderTest.java       |  3 +-
 .../resultset/CachedResultSetManagerTest.java |  3 +-
 .../resultset/ExperimentProviderTest.java     |  3 +-
 .../FileFormatTypesProviderTest.java          |  3 +-
 .../server/resultset/PersonsProviderTest.java |  3 +-
 .../resultset/RoleAssignmentProviderTest.java |  3 +-
 .../server/resultset/SampleProviderTest.java  |  3 +-
 .../server/resultset/ScriptProviderTest.java  |  3 +-
 .../resultset/TableForUpdateExporterTest.java |  3 +-
 .../resultset/VocabulariesProviderTest.java   |  3 +-
 .../SearchableEntityTranslatorTest.java       |  3 +-
 .../server/util/CustomColumnUtilsTest.java    |  3 +-
 .../web/server/util/FilterUtilsTest.java      |  3 +-
 .../web/server/util/TSVRendererTest.java      |  3 +-
 .../util/XMLPropertyTransformerTest.java      |  3 +-
 .../generic/server/AbstractServerTest.java    |  3 +-
 .../generic/server/CommonServerTest.java      |  3 +-
 .../ConcurrentOperationLimiterConfigTest.java |  3 +-
 .../ConcurrentOperationLimiterTest.java       | 15 ++++
 .../DataStoreServiceRegistratorTest.java      |  3 +-
 .../DatabaseLastModificationAdvisorTest.java  |  3 +-
 .../server/DisplaySettingsProviderTest.java   |  3 +-
 .../server/ETLServiceDatabaseTest.java        |  3 +-
 .../generic/server/ETLServiceTest.java        |  3 +-
 .../server/JythonEvaluatorPoolTest.java       |  3 +-
 ...LongRunningThreadLogConfigurationTest.java |  3 +-
 .../server/ServerInterfaceRegressionTest.java |  3 +-
 .../server/ServiceForDataStoreServerTest.java |  3 +-
 .../server/TestJythonEvaluatorPool.java       |  3 +-
 ...GeneralInformationChangingServiceTest.java |  3 +-
 ...GeneralInformationServiceDatabaseTest.java |  3 +-
 .../api/v1/GeneralInformationServiceTest.java |  3 +-
 ...oDataSetRelatedEntitiesTranslatorTest.java |  3 +-
 ...oDetailedSearchCriteriaTranslatorTest.java |  3 +-
 .../v1/sort/SampleSearchResultSorterTest.java |  2 +-
 .../authorization/AuthorizationTestCase.java  |  3 +-
 .../authorization/AuthorizationTestUtil.java  |  3 +-
 .../authorization/CapabilityMapTest.java      |  3 +-
 .../DefaultAccessControllerTest.java          |  3 +-
 .../DefaultReturnValueFilterTest.java         |  3 +-
 .../authorization/PredicateExecutorTest.java  |  3 +-
 .../authorization/RoleWithIdentifierTest.java |  3 +-
 .../TestAuthorizationConfig.java              |  3 +-
 ...AbstractTechIdCollectionPredicateTest.java |  3 +-
 .../AbstractTechIdPredicateTest.java          |  3 +-
 .../predicate/ArrayPredicateTest.java         |  3 +-
 .../BasicEntityDescriptionPredicateTest.java  |  3 +-
 .../predicate/CollectionPredicateTest.java    |  3 +-
 .../predicate/DataSetCodePredicateTest.java   |  3 +-
 ...DataSetUpdatesCollectionPredicateTest.java |  3 +-
 .../ListSampleCriteriaPredicateTest.java      |  3 +-
 .../predicate/NewExperimentPredicateTest.java |  3 +-
 .../predicate/NewSamplePredicateTest.java     |  3 +-
 .../SampleUpdatesCollectionPredicateTest.java |  3 +-
 .../SpaceIdentifierPredicateTest.java         |  3 +-
 .../project/ProjectAuthorizationTest.java     | 15 ++++
 .../project/TestAuthSessionProvider.java      |  3 +-
 .../authorization/project/TestPredicate.java  |  3 +-
 .../authorization/project/TestProject.java    |  3 +-
 .../authorization/project/TestRole.java       |  3 +-
 .../CustomGridExpressionValidatorTest.java    |  3 +-
 .../validator/ExperimentValidatorTest.java    |  3 +-
 .../validator/ExternalDataValidatorTest.java  |  3 +-
 .../validator/GroupValidatorTest.java         |  3 +-
 .../MatchingEntityValidatorTest.java          |  3 +-
 .../validator/SampleValidatorTest.java        |  3 +-
 .../server/business/ManagerTestTool.java      |  3 +-
 .../PropertiesBatchEvaluationErrorsTest.java  |  3 +-
 .../business/PropertiesBatchManagerTest.java  |  3 +-
 .../server/business/bo/AbstractBOTest.java    |  3 +-
 .../business/bo/AuthorizationGroupBOTest.java |  3 +-
 .../server/business/bo/CollectionMatcher.java |  3 +-
 .../business/bo/CorePluginTableTest.java      |  3 +-
 .../server/business/bo/DataBOTest.java        | 18 +++-
 .../server/business/bo/DataSetTableTest.java  |  3 +-
 .../server/business/bo/EntityTypeBOTest.java  |  3 +-
 .../bo/EntityTypePropertyTypeBOTest.java      |  3 +-
 .../server/business/bo/ExperimentBOTest.java  |  3 +-
 .../business/bo/ExperimentTableTest.java      |  3 +-
 .../business/bo/GridCustomFilterBOTest.java   |  3 +-
 .../server/business/bo/MaterialTableTest.java |  3 +-
 .../server/business/bo/ProjectBOTest.java     |  3 +-
 .../business/bo/PropertyTypeBOTest.java       |  3 +-
 .../business/bo/PropertyValidatorTest.java    |  3 +-
 .../business/bo/RoleAssignmentTableTest.java  |  3 +-
 .../server/business/bo/SampleBOTest.java      |  3 +-
 .../bo/SampleGenericBusinessRulesTest.java    |  3 +-
 .../server/business/bo/SampleTableTest.java   |  3 +-
 .../server/business/bo/ScriptBOTest.java      |  3 +-
 .../business/bo/SearchDomainSearcherTest.java |  3 +-
 .../server/business/bo/SpaceBOTest.java       |  3 +-
 .../server/business/bo/TrashBOTest.java       |  3 +-
 .../server/business/bo/VocabularyBOTest.java  |  3 +-
 .../bo/common/EntityListingTestUtils.java     |  3 +-
 .../common/EntityPropertiesEnricherTest.java  |  3 +-
 .../bo/common/WrappingDataIterator.java       |  3 +-
 .../SecondaryEntityListingQueryTest.java      |  3 +-
 .../datasetlister/DatasetListerFastTest.java  |  3 +-
 .../bo/datasetlister/DatasetListerTest.java   |  3 +-
 .../DatasetListingQueryTest.java              |  3 +-
 .../DatasetSetListingQueryTest.java           |  3 +-
 .../business/bo/entitygraph/DataSetNode.java  |  3 +-
 .../bo/entitygraph/EntityGraphGenerator.java  |  3 +-
 .../business/bo/entitygraph/EntityNode.java   |  3 +-
 .../bo/entitygraph/ExperimentNode.java        |  3 +-
 .../business/bo/entitygraph/SampleNode.java   |  3 +-
 .../server/business/bo/entitygraph/Utils.java |  3 +-
 .../datasetlister/DataSetListerTest.java      |  3 +-
 .../ExperimentListerTest.java                 |  3 +-
 .../samplelister/SampleListerTest.java        |  3 +-
 .../EntityInformationProviderTest.java        |  3 +-
 .../AbstractBatchIteratorTest.java            |  3 +-
 .../bo/materiallister/MaterialListerTest.java |  3 +-
 .../MaterialListingQueryTest.java             |  3 +-
 .../samplelister/SampleListingQueryTest.java  |  3 +-
 .../samplelister/SampleListingWorkerTest.java |  3 +-
 .../SampleSetListingQueryTest.java            |  3 +-
 .../DatabaseInstanceImporterTest.java         |  3 +-
 .../search/SampleSearchManagerTest.java       |  3 +-
 .../sort/SearchResultSorterByScoreTest.java   | 15 ++++
 .../sort/SearchResultSorterTestHelper.java    | 15 ++++
 ...toreServerBasedDataSourceProviderTest.java |  3 +-
 ...ynamicPropertyEvaluationSchedulerTest.java | 15 ++++
 .../EntityPropertiesConverterTest.java        |  3 +-
 .../server/dataaccess/EodSqlUtilsTest.java    |  3 +-
 .../server/dataaccess/db/AbstractDAOTest.java |  3 +-
 .../db/AbstractDAOWithoutContextTest.java     |  3 +-
 .../dataaccess/db/AttachmentDAOTest.java      |  3 +-
 .../db/AuthorizationGroupDAOTest.java         |  3 +-
 .../dataaccess/db/CorePluginDAOTest.java      |  3 +-
 .../server/dataaccess/db/DAOFactoryTest.java  | 15 ++++
 .../server/dataaccess/db/DataDAOTest.java     | 18 +++-
 .../dataaccess/db/DataStoreDAOTest.java       |  3 +-
 .../dataaccess/db/DatabaseCreationUtil.java   |  3 +-
 .../server/dataaccess/db/DeletionDAOTest.java |  3 +-
 .../db/EntityOperationsLogDAOTest.java        |  3 +-
 .../db/EntityPropertyTypeDAOTest.java         |  3 +-
 .../db/EntityResolverQueryTest.java           |  3 +-
 .../dataaccess/db/EntityTypeDAOTest.java      |  3 +-
 .../server/dataaccess/db/EventDAOTest.java    |  3 +-
 .../dataaccess/db/ExperimentDAOTest.java      |  3 +-
 .../ExternalDataManagementSystemDAOTest.java  |  3 +-
 .../dataaccess/db/FileFormatTypeDAOTest.java  |  3 +-
 .../db/GridCustomColumnDAOTest.java           |  3 +-
 .../db/GridCustomFilterDAOTest.java           |  3 +-
 .../server/dataaccess/db/GroupDAOTest.java    |  3 +-
 .../dataaccess/db/HibernateSearchDAOTest.java |  3 +-
 .../server/dataaccess/db/MaterialDAOTest.java |  3 +-
 .../dataaccess/db/MetaprojectDAOTest.java     |  3 +-
 .../db/OperationExecutionDAOTest.java         |  3 +-
 .../server/dataaccess/db/PermIdDAOTest.java   |  3 +-
 .../server/dataaccess/db/PersonDAOTest.java   |  3 +-
 .../db/PersonalAccessTokenDAOTest.java        | 15 ++++
 .../server/dataaccess/db/ProjectDAOTest.java  |  3 +-
 .../dataaccess/db/PropertyTypeDAOTest.java    |  3 +-
 .../server/dataaccess/db/QueryDAOTest.java    |  3 +-
 .../dataaccess/db/RoleAssignmentDAOTest.java  |  3 +-
 .../server/dataaccess/db/SampleDAOTest.java   |  3 +-
 .../dataaccess/db/SampleTypeDAOTest.java      |  3 +-
 .../server/dataaccess/db/ScriptDAOTest.java   |  3 +-
 .../dataaccess/db/SqlDataMigrationTest.java   |  3 +-
 .../dataaccess/db/SqlMigrationTest.java       |  3 +-
 .../dataaccess/db/VocabularyDAOTest.java      |  3 +-
 .../dataaccess/db/scalability/DBCreator.java  |  3 +-
 .../DynamicPropertyEvaluatorDbTest.java       |  3 +-
 .../DynamicPropertyEvaluatorTest.java         |  3 +-
 .../DynamicPropertyCalculatorTest.java        |  3 +-
 .../DynamicPropertyFunctionsTest.java         |  3 +-
 .../event/DeleteDataSetEventBuilderTest.java  |  3 +-
 .../event/DeleteDataSetEventParserTest.java   |  3 +-
 .../MigrationStepFrom023To024Test.java        |  3 +-
 .../MigrationStepFrom025To026Test.java        |  3 +-
 ...MasterDataRegistrationTransactionTest.java |  3 +-
 .../jython/api/v1/impl/VocabularyTest.java    |  3 +-
 ...kenOpenBisSessionManagerDecoratorTest.java | 15 ++++
 ...nalAccessTokenValidityWarningTaskTest.java | 15 ++++
 .../task/ArchivingByRequestTaskTest.java      |  3 +-
 .../DataSetRegistrationSummaryTaskTest.java   |  3 +-
 ...edByMaterialChangeMaintenanceTaskTest.java |  3 +-
 .../task/MaterialExternalDBSyncTaskTest.java  |  3 +-
 .../generic/server/task/PeriodTypeTest.java   |  3 +-
 .../SessionCleanUpMaintenanceTaskTest.java    |  3 +-
 ...onWorkspaceCleanUpMaintenanceTaskTest.java |  3 +-
 .../server/task/UsageGathererTest.java        |  3 +-
 .../server/task/UsageReportingTaskTest.java   |  3 +-
 .../UserManagementMaintenanceTaskTest.java    |  3 +-
 .../EventsSearchMaintenanceTaskTest.java      | 15 ++++
 .../util/AnnotationAppliedTestCase.java       |  3 +-
 .../server/util/SimpleDateRendererTest.java   |  3 +-
 .../generic/server/util/TestInitializer.java  |  3 +-
 .../server/util/TimeIntervalChecker.java      |  3 +-
 .../generic/server/util/UuidUtilTest.java     |  3 +-
 .../shared/AbstractServerTestCase.java        |  3 +-
 .../generic/shared/CommonTestUtils.java       |  3 +-
 .../generic/shared/DataSetInfoHelperTest.java |  3 +-
 .../openbis/generic/shared/INormalizer.java   |  3 +-
 .../shared/ServletParamsParsingTestUtils.java |  3 +-
 .../shared/SessionWorkspaceProviderTest.java  | 15 ++++
 .../json/AbstractGenericObjectMapperTest.java |  3 +-
 .../generic/shared/api/v1/TranslatorTest.java |  3 +-
 .../shared/api/v1/dto/DataSetBuilder.java     |  3 +-
 .../shared/api/v1/dto/DataSetTest.java        |  3 +-
 .../api/v1/dto/DataSetTypeFilterTest.java     |  3 +-
 .../shared/api/v1/dto/DataSetTypeTest.java    |  3 +-
 .../shared/api/v1/dto/SampleBuilder.java      |  3 +-
 .../generic/shared/api/v1/dto/SampleTest.java |  3 +-
 .../shared/api/v1/dto/SearchCriteriaTest.java |  3 +-
 .../PropertiesBasedDataSetFilterTest.java     |  3 +-
 .../v1/filter/TypeBasedDataSetFilterTest.java |  3 +-
 .../api/v1/json/GenericObjectMapperTest.java  |  3 +-
 .../AuthorizationConfigTest.java              | 15 ++++
 .../shared/basic/BasicURLEncoderTest.java     |  3 +-
 .../shared/basic/ExpressionUtilTest.java      |  3 +-
 .../shared/basic/MetaprojectNameTest.java     |  3 +-
 .../openbis/generic/shared/basic/Row.java     |  3 +-
 .../shared/basic/TableModelAppenderTest.java  |  3 +-
 .../basic/URLMethodWithParametersTest.java    |  3 +-
 .../shared/basic/WebAppsPropertiesTest.java   |  3 +-
 .../dto/AtomicEntityOperationDetailsTest.java |  3 +-
 .../basic/dto/DeletedDataSetLocationTest.java |  3 +-
 .../basic/dto/DssLinkTableCellTest.java       | 15 ++++
 .../dto/ExternalDataLocationNodeTest.java     |  3 +-
 .../dto/GeneratedImageTableCellTest.java      | 15 ++++
 .../shared/basic/dto/LinkDataSetUrlTest.java  |  3 +-
 .../shared/basic/dto/LinkModelTest.java       |  3 +-
 .../basic/dto/MaterialIdentifierTest.java     |  3 +-
 .../shared/basic/dto/PrimitiveValueTest.java  | 15 ++++
 .../basic/dto/RoleWithHierarchyTest.java      |  3 +-
 .../generic/shared/basic/dto/WebAppTest.java  |  3 +-
 .../dto/builders/AbstractDataSetBuilder.java  |  3 +-
 .../builders/AbstractEntityTypeBuilder.java   |  3 +-
 .../dto/builders/ContainerDataSetBuilder.java |  3 +-
 .../basic/dto/builders/DataSetBuilder.java    |  3 +-
 .../dto/builders/DataSetTypeBuilder.java      |  3 +-
 .../basic/dto/builders/DataStoreBuilder.java  |  3 +-
 .../EntityTypePropertyTypeBuilder.java        |  3 +-
 .../basic/dto/builders/ExperimentBuilder.java |  3 +-
 .../dto/builders/ExperimentTypeBuilder.java   |  3 +-
 .../dto/builders/LinkDataSetBuilder.java      |  3 +-
 .../dto/builders/MaterialTypeBuilder.java     |  3 +-
 .../basic/dto/builders/PersonBuilder.java     |  3 +-
 .../dto/builders/PropertyTypeBuilder.java     |  3 +-
 .../basic/dto/builders/SampleBuilder.java     |  3 +-
 .../basic/dto/builders/SampleTypeBuilder.java |  3 +-
 .../dto/builders/VocabularyTermBuilder.java   |  3 +-
 .../shared/basic/utils/GroupByMapTest.java    |  3 +-
 .../calculator/StandardFunctionsTest.java     |  3 +-
 .../coreplugin/CorePluginScannerTest.java     |  3 +-
 .../coreplugin/CorePluginsInjectorTest.java   |  3 +-
 .../coreplugin/CorePluginsUtilsTest.java      |  3 +-
 .../coreplugin/ModuleEnabledCheckerTest.java  |  3 +-
 .../webapps/CorePluginRegistratorTest.java    |  3 +-
 .../shared/dto/DataSourceDefinitionTest.java  |  3 +-
 .../builders/AbstractEntityTypePEBuilder.java |  3 +-
 .../builders/DatasetDescriptionBuilder.java   |  3 +-
 .../EntityTypePropertyTypePEBuilder.java      |  3 +-
 .../dto/builders/ExperimentTypePEBuilder.java |  3 +-
 .../dto/builders/ExternalDataPEBuilder.java   |  3 +-
 .../shared/dto/builders/SamplePEBuilder.java  |  3 +-
 .../dto/builders/SampleTypePEBuilder.java     |  3 +-
 .../dto/builders/SampleUpdatesDTOBuilder.java |  3 +-
 .../shared/dto/builders/ScriptPEBuilder.java  |  3 +-
 .../shared/dto/builders/SpacePEBuilder.java   |  3 +-
 .../identifier/ExperimentIdentifierTest.java  |  3 +-
 .../dto/identifier/ProjectIdentifierTest.java |  3 +-
 .../SampleIdentifierFactoryTest.java          |  3 +-
 .../dto/identifier/SampleIdentifierTest.java  |  3 +-
 .../identifier/SampleOwnerIdentifierTest.java |  3 +-
 .../dto/identifier/SpaceIdentifierTest.java   |  3 +-
 .../JythonManagedPropertyEvaluatorTest.java   |  3 +-
 ...stractStructuredPropertyConverterTest.java |  3 +-
 .../structured/ElementFactoryTest.java        |  3 +-
 ...nOrXMLStructuredPropertyConverterTest.java |  3 +-
 .../JsonStructuredPropertyConverterTest.java  |  3 +-
 ...StructuredPropertyConverterPythonTest.java |  3 +-
 ...OrJsonStructuredPropertyConverterTest.java |  3 +-
 .../XmlStructuredPropertyConverterTest.java   |  3 +-
 .../parser/GlobalPropertiesLoaderTest.java    |  3 +-
 .../NewSampleParserObjectFactoryTest.java     |  3 +-
 .../SampleUploadSectionsParserTest.java       |  3 +-
 .../UpdatedSampleParserObjectFactoryTest.java |  3 +-
 .../translator/DataSetTranslatorTest.java     | 18 +++-
 ...nalDataManagementSystemTranslatorTest.java |  3 +-
 .../translator/SimpleDataSetHelperTest.java   |  3 +-
 .../generic/shared/util/CacheManagerTest.java |  3 +-
 .../shared/util/DataTypeUtilsTest.java        |  3 +-
 .../generic/shared/util/EntityHelperTest.java |  3 +-
 .../generic/shared/util/ServerUtilsTest.java  |  3 +-
 .../util/SimplePropertyValidatorTest.java     |  3 +-
 .../util/SimpleTableModelBuilderTest.java     |  3 +-
 .../shared/util/TestInstanceHostUtils.java    |  3 +-
 .../util/TypedTableModelBuilderTest.java      |  3 +-
 .../util/WebClientFilesUpdaterTest.java       |  3 +-
 .../generic/shared/util/XmlUtilsTest.java     |  3 +-
 .../plugin/demo/server/DemoServerTest.java    |  3 +-
 .../server/ServerInterfaceRegressionTest.java |  3 +-
 .../web/client/application/PropertyField.java |  3 +-
 .../application/dataset/CheckDataSet.java     |  3 +-
 .../dataset/FillDataSetEditForm.java          |  3 +-
 .../dataset/GenericDataSetEditorTest.java     |  3 +-
 .../dataset/GenericDataSetViewerTest.java     |  3 +-
 .../client/application/dataset/Property.java  |  3 +-
 .../experiment/CheckExperiment.java           |  3 +-
 .../experiment/DownloadAttachment.java        |  3 +-
 .../experiment/FillExperimentEditForm.java    |  3 +-
 .../FillExperimentRegistrationForm.java       |  3 +-
 ...nericExperimentAttachmentDownloadTest.java |  3 +-
 .../GenericExperimentEditorTest.java          |  3 +-
 .../GenericExperimentRegistrationTest.java    |  3 +-
 .../GenericExperimentViewerTest.java          |  3 +-
 .../application/experiment/Property.java      |  3 +-
 .../application/sample/CheckSample.java       |  3 +-
 .../sample/FillSampleRegistrationForm.java    |  3 +-
 .../sample/GenericSampleRegistrationTest.java |  3 +-
 .../sample/GenericSampleViewerTest.java       |  3 +-
 .../ParentsPropertiesSectionBuilderTest.java  |  3 +-
 .../client/application/sample/Property.java   |  3 +-
 .../server/AttachmentDownloadServletTest.java |  3 +-
 .../web/server/GenericClientServiceTest.java  |  3 +-
 ...UpdatedDataSetParserObjectFactoryTest.java |  3 +-
 .../server/EntityExistenceCheckerTest.java    |  3 +-
 .../server/GenericServerDatabaseTest.java     |  3 +-
 .../generic/server/GenericServerTest.java     |  3 +-
 .../NormalizedSampleIdentifierTest.java       |  3 +-
 .../server/ServerInterfaceRegressionTest.java |  3 +-
 .../QueryExpressionProviderTest.java          |  3 +-
 .../openbis/plugin/query/server/DAOTest.java  |  3 +-
 .../query/server/QueryApiServerJsonTest.java  |  3 +-
 .../plugin/query/server/QueryServerTest.java  |  3 +-
 .../server/ServerInterfaceRegressionTest.java |  3 +-
 .../server/api/v1/QueryApiServerTest.java     |  3 +-
 .../QueryAccessControllerTest.java            |  3 +-
 .../resultfilter/DataSetGroupLoaderTest.java  |  3 +-
 .../ExperimentGroupLoaderTest.java            |  3 +-
 .../resultfilter/GroupLoaderFactoryTest.java  |  3 +-
 .../resultfilter/QueryResultFilterTest.java   |  3 +-
 .../resultfilter/SampleGroupLoaderTest.java   |  3 +-
 .../QueryTableModelTranslatorTest.java        |  3 +-
 .../remoteapitest/RemoteApiTestCase.java      |  3 +-
 .../DateBasedSearchesThroughJsonApiTest.java  |  3 +-
 ...InformationChangingServiceJsonApiTest.java |  3 +-
 ...lInformationServiceHttpInvokerApiTest.java |  3 +-
 .../GeneralInformationServiceJsonApiTest.java |  3 +-
 .../api/v1/QueryApiServerJsonTest.java        |  3 +-
 .../api/v1/TestJsonServiceFactory.java        |  3 +-
 .../systemtest/ANewMetadataUITest.java        | 15 ++++
 ...tAssignmentSampleToExperimentTestCase.java |  3 +-
 .../AbstractDataSetAssignmentTestCase.java    |  3 +-
 .../AbstractEntityDeletionTestCase.java       |  3 +-
 ...ssignDataSetToExperimentAndSampleTest.java |  3 +-
 ...oExperimentAndSampleViaDropBoxAPITest.java |  3 +-
 .../AssignExperimentToProjectTest.java        |  3 +-
 .../systemtest/AssignProjectToSpaceTest.java  |  3 +-
 .../AssignSampleToExperimentTest.java         |  3 +-
 ...gnSampleToExperimentViaDropBoxAPITest.java |  3 +-
 .../systemtest/AssignSampleToSpaceTest.java   |  3 +-
 .../systemtest/AttachmentUploadTest.java      |  3 +-
 .../systemtest/AuthenticationSystemTest.java  |  3 +-
 ...atchMaterialRegistrationAndUpdateTest.java |  3 +-
 .../systemtest/CodeGenerationTest.java        |  3 +-
 .../openbis/systemtest/CommonServerTest.java  |  3 +-
 .../systemtest/DataSetListingTest.java        |  3 +-
 .../DataStoreServiceRegistrationTest.java     |  3 +-
 ...leteDataSetBeforePostRegistrationTest.java |  3 +-
 .../openbis/systemtest/DeletionTestCase.java  |  3 +-
 .../systemtest/EntityDeletionTest.java        |  3 +-
 .../systemtest/EntityOperationBuilder.java    |  3 +-
 .../systemtest/EntityOperationTest.java       |  3 +-
 .../systemtest/ExperimentBrowsingTest.java    |  3 +-
 .../openbis/systemtest/FilterSystemTest.java  |  3 +-
 .../openbis/systemtest/HistoryRowMapper.java  |  3 +-
 .../systemtest/PersistentSystemTestCase.java  |  3 +-
 .../systemtest/PropertiesHistoryTest.java     |  3 +-
 .../openbis/systemtest/PropertyHistory.java   |  3 +-
 .../systemtest/RegisterDataSetTest.java       |  3 +-
 .../systemtest/RegisterSampleTest.java        |  3 +-
 .../RelationshipServiceAuthorizationTest.java |  3 +-
 .../systemtest/SamplesListingTest.java        |  3 +-
 .../openbis/systemtest/SessionUpdateTest.java |  3 +-
 .../systemtest/SetSessionUserTest.java        |  3 +-
 .../openbis/systemtest/SystemTestCase.java    |  3 +-
 .../systemtest/TypedTableAssertions.java      | 15 ++++
 .../UnassignSampleFromExperimentTest.java     |  3 +-
 .../UnassignSampleFromSpaceTest.java          |  3 +-
 .../UpdateDataSetContainmentTest.java         |  3 +-
 .../systemtest/UpdateDataSetParentsTest.java  |  3 +-
 .../openbis/systemtest/UpdateDataSetTest.java | 15 ++++
 .../UpdateSampleContainmentTest.java          |  3 +-
 .../systemtest/UpdateSampleParentsTest.java   |  3 +-
 .../openbis/systemtest/UpdateSampleTest.java  |  3 +-
 .../api/common/json/JsonApiClient.java        |  3 +-
 ...GeneralInformationChangingServiceTest.java |  3 +-
 .../api/v1/GeneralInformationServiceTest.java |  3 +-
 ...asterDataRegistrationScriptRunnerTest.java |  3 +-
 .../CommonAuthorizationSystemTestService.java |  3 +-
 .../CommonServerAuthorizationTest.java        |  3 +-
 .../ETLServiceAuthorizationTest.java          |  3 +-
 .../GenericServerAuthorizationTest.java       |  3 +-
 .../authorization/PersonManagementTest.java   |  3 +-
 .../ProjectAuthorizationMigrationTest.java    |  3 +-
 ...jectAuthorizationMigrationTestService.java |  3 +-
 .../ProjectAuthorizationUser.java             |  3 +-
 .../QueryServerAuthorizationTest.java         |  3 +-
 .../dataset/DataSetPredicateTestService.java  |  3 +-
 .../DeletionPredicateTestService.java         |  3 +-
 .../entity/EntityPredicateTestService.java    |  3 +-
 .../ExperimentPredicateTestService.java       |  3 +-
 .../project/ProjectPredicateTestService.java  |  3 +-
 .../sample/SamplePredicateTestService.java    |  3 +-
 .../space/SpacePredicateTestService.java      |  3 +-
 .../dataset/DataSetValidatorTestService.java  |  3 +-
 .../DeletionValidatorTestService.java         |  3 +-
 .../entity/EntityValidatorTestService.java    |  3 +-
 .../ExperimentValidatorTestService.java       |  3 +-
 .../project/ProjectValidatorTestService.java  |  3 +-
 .../sample/SampleValidatorTestService.java    |  3 +-
 .../space/SpaceValidatorTestService.java      |  3 +-
 .../openbis/systemtest/base/BaseTest.java     |  3 +-
 .../base/RelationshipServiceStub.java         |  3 +-
 .../base/auth/AndAuthorizationRule.java       |  3 +-
 .../base/auth/AuthorizationRule.java          |  3 +-
 .../base/auth/BasicAuthorizationRule.java     |  3 +-
 .../systemtest/base/auth/GuardedDomain.java   |  3 +-
 .../systemtest/base/auth/InstanceDomain.java  |  3 +-
 .../base/auth/NotAuthorizationRule.java       |  3 +-
 .../base/auth/OrAuthorizationRule.java        |  3 +-
 .../systemtest/base/auth/RolePermutator.java  |  3 +-
 .../systemtest/base/auth/SpaceDomain.java     |  3 +-
 .../systemtest/base/builder/Builder.java      |  3 +-
 .../base/builder/DataSetDeletionBuilder.java  |  3 +-
 .../base/builder/DataSetUpdateBuilder.java    |  3 +-
 .../base/builder/ExperimentBuilder.java       |  3 +-
 .../base/builder/ExperimentUpdateBuilder.java |  3 +-
 .../base/builder/ExternalDataBuilder.java     |  3 +-
 .../base/builder/ProjectBuilder.java          |  3 +-
 .../base/builder/ProjectUpdateBuilder.java    |  3 +-
 .../base/builder/SampleBuilder.java           |  3 +-
 .../base/builder/SampleUpdateBuilder.java     |  3 +-
 .../base/builder/SessionBuilder.java          |  3 +-
 .../systemtest/base/builder/SpaceBuilder.java |  3 +-
 .../base/builder/TrashEmptyBuilder.java       |  3 +-
 .../base/builder/UpdateBuilder.java           |  3 +-
 .../ExternalDataHasChildrenMatcher.java       |  3 +-
 .../ExternalDataHasComponentsMatcher.java     |  3 +-
 .../ExternalDataHasContainerMatcher.java      |  3 +-
 .../ExternalDataHasNoSampleMatcher.java       |  3 +-
 .../ExternalDataHasParentsMatcher.java        |  3 +-
 .../base/matcher/HasNoChildrenMatcher.java    |  3 +-
 .../base/matcher/HasNoContainerMatcher.java   |  3 +-
 .../base/matcher/HasNoParentMatcher.java      |  3 +-
 .../base/matcher/InExperimentMatcher.java     |  3 +-
 .../base/matcher/InProjectMatcher.java        |  3 +-
 .../base/matcher/InSampleMatcher.java         |  3 +-
 .../base/matcher/InSpaceMatcher.java          |  3 +-
 .../matcher/SampleHasContainerMatcher.java    |  3 +-
 .../base/matcher/SampleHasParentsMatcher.java |  3 +-
 .../entitygraph/EntityGraphManager.java       |  3 +-
 ...ctServiceConversationProgressListener.java |  3 +-
 .../DataSetOptimisticLockingTest.java         |  3 +-
 .../ExperimentOptimisticLockingTest.java      |  3 +-
 ...ltiThreadDataSetOptimisticLockingTest.java |  3 +-
 ...ThreadExperimentOptimisticLockingTest.java |  3 +-
 .../MultiThreadOptimisticLockingTestCase.java |  3 +-
 ...ltiThreadProjectOptimisticLockingTest.java |  3 +-
 ...ultiThreadSampleOptimisticLockingTest.java |  3 +-
 .../OptimisticLockingTestCase.java            |  3 +-
 .../ProjectOptimisticLockingTest.java         |  3 +-
 .../SampleOptimisticLockingTest.java          |  3 +-
 .../optimistic_locking/ToolBox.java           |  3 +-
 .../RegistrationTest.java                     |  3 +-
 .../DynamicPropertiesEvaluationTest.java      |  3 +-
 .../plugin/generic/EntityValidationTest.java  |  3 +-
 .../generic/ExperimentRegistrationTest.java   |  3 +-
 .../generic/FileFormatTypeHeadlessTest.java   |  3 +-
 .../plugin/generic/GenericSystemTestCase.java |  3 +-
 .../plugin/generic/SampleBrowsingTest.java    |  3 +-
 .../plugin/generic/SampleDetailsTest.java     |  3 +-
 .../generic/SampleRegistrationTest.java       |  3 +-
 .../plugin/query/QueryEditingTest.java        |  3 +-
 .../plugin/query/QuerySystemTestCase.java     |  3 +-
 .../AbstractRelationshipsHistory.java         |  3 +-
 .../AbstractRelationshipsHistoryMapper.java   |  3 +-
 .../AbstractRelationshipsHistoryTest.java     |  3 +-
 .../DataSetOwnerRelationshipsHistoryTest.java |  3 +-
 .../DataSetRelationshipsHistory.java          |  3 +-
 .../DataSetRelationshipsHistoryMapper.java    |  3 +-
 ...aSetToDataSetRelationshipsHistoryTest.java |  3 +-
 .../ExperimentRelationshipsHistory.java       |  3 +-
 .../ExperimentRelationshipsHistoryMapper.java |  3 +-
 ...erimentSampleRelationshipsHistoryTest.java |  3 +-
 .../SampleRelationshipsHistory.java           |  3 +-
 .../SampleRelationshipsHistoryMapper.java     |  3 +-
 ...ampleToSampleRelationshipsHistoryTest.java |  3 +-
 .../systemtest/server/CommonServerTest.java   |  3 +-
 .../systemtest/task/AuthorizationLevel.java   |  3 +-
 .../task/UserManagerExpectationsBuilder.java  |  3 +-
 .../systemtest/task/UserManagerTest.java      |  4 +-
 .../task/UserManagerTestService.java          |  3 +-
 .../util/GeneralInformationServiceUtil.java   |  3 +-
 .../cisd/openbis/util/LogRecordingUtils.java  |  3 +-
 5190 files changed, 10065 insertions(+), 9713 deletions(-)

diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/FileServiceServlet.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/FileServiceServlet.java
index 3f4d32bd990..24b3e41fd8a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/FileServiceServlet.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/FileServiceServlet.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;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/SingleSignOnServlet.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/SingleSignOnServlet.java
index 329dd1b595d..838e4257d3b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/SingleSignOnServlet.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/SingleSignOnServlet.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;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApi.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApi.java
index b1f7446290f..2a2516c410d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApi.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApi.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.ethz.sis.openbis.generic.server.asapi.v3;
 
 import java.util.Collections;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiJsonServer.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiJsonServer.java
index 8bfb8f81cce..70ad78a47a1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiJsonServer.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiJsonServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.asapi.v3;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiLogger.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiLogger.java
index 328f6b369d7..0074a5a172b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiLogger.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiLogger.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.ethz.sis.openbis.generic.server.asapi.v3;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiPersonalAccessTokenInvocationHandler.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiPersonalAccessTokenInvocationHandler.java
index 4edc976c22f..071eb6b1ed4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiPersonalAccessTokenInvocationHandler.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiPersonalAccessTokenInvocationHandler.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.asapi.v3;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiServer.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiServer.java
index ea44e5e9845..791bc2fe5c4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiServer.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.asapi.v3;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/IApplicationServerInternalApi.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/IApplicationServerInternalApi.java
index 047cc61329f..47070627c08 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/IApplicationServerInternalApi.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/IApplicationServerInternalApi.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.asapi.v3;
 
 import org.springframework.transaction.annotation.Transactional;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/FetchOptionsMatcher.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/FetchOptionsMatcher.java
index 13885f1d9cc..353d048a97c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/FetchOptionsMatcher.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/FetchOptionsMatcher.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.asapi.v3.cache;
 
 import java.lang.reflect.Constructor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/ISearchCache.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/ISearchCache.java
index 160668630fa..7adeb24cd5f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/ISearchCache.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/ISearchCache.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.ethz.sis.openbis.generic.server.asapi.v3.cache;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/SearchCache.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/SearchCache.java
index ae1eeacf1df..31c478984ff 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/SearchCache.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/SearchCache.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.asapi.v3.cache;
 
 import javax.annotation.PostConstruct;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/SearchCacheCleanupListener.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/SearchCacheCleanupListener.java
index e782a0aa74d..0f0e178ea7f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/SearchCacheCleanupListener.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/SearchCacheCleanupListener.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.asapi.v3.cache;
 
 import org.apache.log4j.Logger;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/SearchCacheEntry.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/SearchCacheEntry.java
index 780554a5e35..6cbc8de9fd1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/SearchCacheEntry.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/SearchCacheEntry.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.ethz.sis.openbis.generic.server.asapi.v3.cache;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/SearchCacheKey.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/SearchCacheKey.java
index 4c9dc4fb17a..c663a1da53c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/SearchCacheKey.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/SearchCacheKey.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.ethz.sis.openbis.generic.server.asapi.v3.cache;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/Context.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/Context.java
index 649efb97f43..0e1f13c81e3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/Context.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/Context.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.ethz.sis.openbis.generic.server.asapi.v3.context;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/IContext.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/IContext.java
index 09e59d9bb81..1b95c546ef8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/IContext.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/IContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.ethz.sis.openbis.generic.server.asapi.v3.context;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.IAuthSessionProvider;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/IProgress.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/IProgress.java
index d30010a40d6..b25b7086f5d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/IProgress.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/IProgress.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.ethz.sis.openbis.generic.server.asapi.v3.context;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/IProgressListener.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/IProgressListener.java
index 4ae92b308c6..f727a5f49d3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/IProgressListener.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/IProgressListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.context;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/IProgressStack.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/IProgressStack.java
index 0af9da48392..21511d602cb 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/IProgressStack.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/IProgressStack.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.context;
 
 import java.util.Iterator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/Progress.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/Progress.java
index df714a4d8bc..fcc1bbdc7f7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/Progress.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/Progress.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.context;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/ProgressDetails.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/ProgressDetails.java
index 63595cb0d7e..3daabd68167 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/ProgressDetails.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/ProgressDetails.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.ethz.sis.openbis.generic.server.asapi.v3.context;
 
 import java.util.LinkedHashMap;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/ProgressDetailsFilterProvider.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/ProgressDetailsFilterProvider.java
index aa51debc481..a476f0ffef0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/ProgressDetailsFilterProvider.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/ProgressDetailsFilterProvider.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.ethz.sis.openbis.generic.server.asapi.v3.context;
 
 import java.lang.reflect.Method;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/ProgressDetailsToStringBuilder.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/ProgressDetailsToStringBuilder.java
index 9ed14719ff0..6011bc033d5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/ProgressDetailsToStringBuilder.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/ProgressDetailsToStringBuilder.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.ethz.sis.openbis.generic.server.asapi.v3.context;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/ProgressFormatter.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/ProgressFormatter.java
index b40c0556da0..8e9359a406b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/ProgressFormatter.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/ProgressFormatter.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.ethz.sis.openbis.generic.server.asapi.v3.context;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/ProgressStack.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/ProgressStack.java
index e3a1f4ddf81..f159c70649b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/ProgressStack.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/ProgressStack.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.server.asapi.v3.context;
 
 import java.util.Iterator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/IOperationContext.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/IOperationContext.java
index f8cf659a8c1..9360baef022 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/IOperationContext.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/IOperationContext.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.ethz.sis.openbis.generic.server.asapi.v3.executor;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.context.IContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/OperationContext.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/OperationContext.java
index 1a9bb6eef7f..0c0cb140e2d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/OperationContext.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/OperationContext.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.ethz.sis.openbis.generic.server.asapi.v3.executor;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.context.Context;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/attachment/CreateAttachmentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/attachment/CreateAttachmentExecutor.java
index 819f271adc9..818dedd1831 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/attachment/CreateAttachmentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/attachment/CreateAttachmentExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.attachment;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/attachment/DeleteAttachmentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/attachment/DeleteAttachmentExecutor.java
index 144543fa09f..da7d80df971 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/attachment/DeleteAttachmentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/attachment/DeleteAttachmentExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.attachment;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/attachment/IAbstractUpdateAttachmentForEntityExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/attachment/IAbstractUpdateAttachmentForEntityExecutor.java
index f0e4cd4306e..7e5d4aaa281 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/attachment/IAbstractUpdateAttachmentForEntityExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/attachment/IAbstractUpdateAttachmentForEntityExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.attachment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.attachment.update.AttachmentListUpdateValue;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/attachment/ICreateAttachmentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/attachment/ICreateAttachmentExecutor.java
index e64982ad218..0c383a12130 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/attachment/ICreateAttachmentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/attachment/ICreateAttachmentExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.attachment;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/attachment/IDeleteAttachmentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/attachment/IDeleteAttachmentExecutor.java
index 57a45d19a20..bf51618a908 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/attachment/IDeleteAttachmentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/attachment/IDeleteAttachmentExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.attachment;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/attachment/IUpdateAttachmentForEntityExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/attachment/IUpdateAttachmentForEntityExecutor.java
index 9c14e178cc1..66ad6156dcc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/attachment/IUpdateAttachmentForEntityExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/attachment/IUpdateAttachmentForEntityExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.attachment;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/attachment/UpdateAttachmentForEntityExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/attachment/UpdateAttachmentForEntityExecutor.java
index c2e637392e8..90a2bb9dfc9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/attachment/UpdateAttachmentForEntityExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/attachment/UpdateAttachmentForEntityExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.attachment;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/AuthorizationGroupAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/AuthorizationGroupAuthorizationExecutor.java
index 6923059f7cf..b5b11ebe538 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/AuthorizationGroupAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/AuthorizationGroupAuthorizationExecutor.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.asapi.v3.executor.authorizationgroup;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/CreateAuthorizationGroupExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/CreateAuthorizationGroupExecutor.java
index d6893aafd67..97d03e0499c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/CreateAuthorizationGroupExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/CreateAuthorizationGroupExecutor.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.asapi.v3.executor.authorizationgroup;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/CreateAuthorizationGroupsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/CreateAuthorizationGroupsOperationExecutor.java
index 1a04e008eb1..7fa4e18ccec 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/CreateAuthorizationGroupsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/CreateAuthorizationGroupsOperationExecutor.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.asapi.v3.executor.authorizationgroup;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/DeleteAuthorizationGroupExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/DeleteAuthorizationGroupExecutor.java
index 157a9768942..1e03139a41e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/DeleteAuthorizationGroupExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/DeleteAuthorizationGroupExecutor.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.asapi.v3.executor.authorizationgroup;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/DeleteAuthorizationGroupsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/DeleteAuthorizationGroupsOperationExecutor.java
index c1a8141c4f7..b4e4ca4f5e2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/DeleteAuthorizationGroupsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/DeleteAuthorizationGroupsOperationExecutor.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.asapi.v3.executor.authorizationgroup;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/GetAuthorizationGroupsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/GetAuthorizationGroupsOperationExecutor.java
index 004c9751f49..6c8cd8a35b3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/GetAuthorizationGroupsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/GetAuthorizationGroupsOperationExecutor.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.asapi.v3.executor.authorizationgroup;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IAuthorizationGroupAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IAuthorizationGroupAuthorizationExecutor.java
index 34cc2961f65..10865f8650e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IAuthorizationGroupAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IAuthorizationGroupAuthorizationExecutor.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.asapi.v3.executor.authorizationgroup;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IAuthorizationGroupTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IAuthorizationGroupTranslator.java
index 48692733afd..ffeaddef12e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IAuthorizationGroupTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IAuthorizationGroupTranslator.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.asapi.v3.executor.authorizationgroup;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.authorizationgroup.AuthorizationGroup;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/ICreateAuthorizationGroupExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/ICreateAuthorizationGroupExecutor.java
index b385e9e0b06..db92d4502fa 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/ICreateAuthorizationGroupExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/ICreateAuthorizationGroupExecutor.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.asapi.v3.executor.authorizationgroup;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.authorizationgroup.create.AuthorizationGroupCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/ICreateAuthorizationGroupsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/ICreateAuthorizationGroupsOperationExecutor.java
index 1d38463ab31..05a3f9757b9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/ICreateAuthorizationGroupsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/ICreateAuthorizationGroupsOperationExecutor.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.asapi.v3.executor.authorizationgroup;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.create.ICreateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IDeleteAuthorizationGroupExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IDeleteAuthorizationGroupExecutor.java
index aa1958a0906..6330a876c22 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IDeleteAuthorizationGroupExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IDeleteAuthorizationGroupExecutor.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.asapi.v3.executor.authorizationgroup;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.authorizationgroup.delete.AuthorizationGroupDeletionOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IDeleteAuthorizationGroupsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IDeleteAuthorizationGroupsOperationExecutor.java
index 61011ebe40a..b0150b53c7a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IDeleteAuthorizationGroupsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IDeleteAuthorizationGroupsOperationExecutor.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.asapi.v3.executor.authorizationgroup;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.delete.IDeleteObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IGetAuthorizationGroupsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IGetAuthorizationGroupsOperationExecutor.java
index 8a0b99d093e..a906c5ee5bc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IGetAuthorizationGroupsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IGetAuthorizationGroupsOperationExecutor.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.asapi.v3.executor.authorizationgroup;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IMapGroupPEByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IMapGroupPEByIdExecutor.java
index e3730bb5fcc..25cd994ab32 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IMapGroupPEByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IMapGroupPEByIdExecutor.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.asapi.v3.executor.authorizationgroup;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.authorizationgroup.id.IAuthorizationGroupId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IMapGroupTechIdByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IMapGroupTechIdByIdExecutor.java
index 5fb5562e834..c5290cb7de6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IMapGroupTechIdByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IMapGroupTechIdByIdExecutor.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.asapi.v3.executor.authorizationgroup;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.authorizationgroup.id.IAuthorizationGroupId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/ISearchAuthorizationGroupExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/ISearchAuthorizationGroupExecutor.java
index f05319f1419..3479ce58f0a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/ISearchAuthorizationGroupExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/ISearchAuthorizationGroupExecutor.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.asapi.v3.executor.authorizationgroup;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.authorizationgroup.search.AuthorizationGroupSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/ISearchAuthorizationGroupsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/ISearchAuthorizationGroupsOperationExecutor.java
index 06b30746c8d..4877fcc4261 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/ISearchAuthorizationGroupsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/ISearchAuthorizationGroupsOperationExecutor.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.asapi.v3.executor.authorizationgroup;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/ISetAuthorizationGroupUsersExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/ISetAuthorizationGroupUsersExecutor.java
index 29a29e7ae02..2ec8758c975 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/ISetAuthorizationGroupUsersExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/ISetAuthorizationGroupUsersExecutor.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.asapi.v3.executor.authorizationgroup;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.authorizationgroup.create.AuthorizationGroupCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IUpdateAuthorizationGroupExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IUpdateAuthorizationGroupExecutor.java
index 54a5d2aa3bf..b18fa87c6c7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IUpdateAuthorizationGroupExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IUpdateAuthorizationGroupExecutor.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.asapi.v3.executor.authorizationgroup;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.authorizationgroup.id.AuthorizationGroupPermId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IUpdateAuthorizationGroupUsersExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IUpdateAuthorizationGroupUsersExecutor.java
index 01bc0950257..d1898012395 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IUpdateAuthorizationGroupUsersExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IUpdateAuthorizationGroupUsersExecutor.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.asapi.v3.executor.authorizationgroup;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.authorizationgroup.update.AuthorizationGroupUpdate;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IUpdateAuthorizationGroupUsersWithCacheExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IUpdateAuthorizationGroupUsersWithCacheExecutor.java
index 34d9f825875..6affde0cc01 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IUpdateAuthorizationGroupUsersWithCacheExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IUpdateAuthorizationGroupUsersWithCacheExecutor.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.asapi.v3.executor.authorizationgroup;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.authorizationgroup.update.AuthorizationGroupUpdate;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IUpdateAuthorizationGroupsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IUpdateAuthorizationGroupsOperationExecutor.java
index f1ff026c753..5d5553e0b33 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IUpdateAuthorizationGroupsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/IUpdateAuthorizationGroupsOperationExecutor.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.asapi.v3.executor.authorizationgroup;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.update.IUpdateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/MapGroupPEByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/MapGroupPEByIdExecutor.java
index bbf9c508788..49d70bbcc16 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/MapGroupPEByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/MapGroupPEByIdExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 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.ethz.sis.openbis.generic.server.asapi.v3.executor.authorizationgroup;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/MapGroupTechIdByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/MapGroupTechIdByIdExecutor.java
index 6c2742c0562..69f6f64ed82 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/MapGroupTechIdByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/MapGroupTechIdByIdExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 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.ethz.sis.openbis.generic.server.asapi.v3.executor.authorizationgroup;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/SearchAuthorizationGroupExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/SearchAuthorizationGroupExecutor.java
index 5ae4b500c05..eb3ebeb4199 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/SearchAuthorizationGroupExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/SearchAuthorizationGroupExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 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.ethz.sis.openbis.generic.server.asapi.v3.executor.authorizationgroup;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/SearchAuthorizationGroupsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/SearchAuthorizationGroupsOperationExecutor.java
index edc0c292bcc..c1c857c9cca 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/SearchAuthorizationGroupsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/SearchAuthorizationGroupsOperationExecutor.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.asapi.v3.executor.authorizationgroup;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.search.planner.ILocalSearchManager;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/SetAuthorizationGroupUsersExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/SetAuthorizationGroupUsersExecutor.java
index 0488be90b79..777263aca83 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/SetAuthorizationGroupUsersExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/SetAuthorizationGroupUsersExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 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.ethz.sis.openbis.generic.server.asapi.v3.executor.authorizationgroup;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/UpdateAuthorizationGroupExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/UpdateAuthorizationGroupExecutor.java
index 0749bda7088..ab6dc5d6f46 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/UpdateAuthorizationGroupExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/UpdateAuthorizationGroupExecutor.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.asapi.v3.executor.authorizationgroup;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/UpdateAuthorizationGroupUsersExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/UpdateAuthorizationGroupUsersExecutor.java
index f626ef6e5b5..f2155b54417 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/UpdateAuthorizationGroupUsersExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/UpdateAuthorizationGroupUsersExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 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.ethz.sis.openbis.generic.server.asapi.v3.executor.authorizationgroup;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/UpdateAuthorizationGroupUsersWithCacheExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/UpdateAuthorizationGroupUsersWithCacheExecutor.java
index ba95f668950..3edb24411b0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/UpdateAuthorizationGroupUsersWithCacheExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/UpdateAuthorizationGroupUsersWithCacheExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 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.ethz.sis.openbis.generic.server.asapi.v3.executor.authorizationgroup;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/UpdateAuthorizationGroupsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/UpdateAuthorizationGroupsOperationExecutor.java
index 3b7325527a2..c184177f3d8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/UpdateAuthorizationGroupsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/authorizationgroup/UpdateAuthorizationGroupsOperationExecutor.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.asapi.v3.executor.authorizationgroup;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/EventExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/EventExecutor.java
index 54b940cbcf7..cfe70af9967 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/EventExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/EventExecutor.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.asapi.v3.executor.common;
 
 import java.util.Collections;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/IEventExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/IEventExecutor.java
index 402b68fa9ee..a521a6c055d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/IEventExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/IEventExecutor.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.asapi.v3.executor.common;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/IObjectAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/IObjectAuthorizationExecutor.java
index 0b22f3eee0b..a2cef94abf0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/IObjectAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/IObjectAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.common;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/IOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/IOperationExecutor.java
index 9343b5b5f1c..3c9768ab98c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/IOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/IOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.common;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/OperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/OperationExecutor.java
index b0ff5201a17..4c59db7e8fe 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/OperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/OperationExecutor.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.server.asapi.v3.executor.common;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/create/CreateObjectsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/create/CreateObjectsOperationExecutor.java
index 63ea6c73a3a..1cb627aaa9f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/create/CreateObjectsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/create/CreateObjectsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.common.create;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.create.CreateObjectsOperation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/create/ICreateObjectsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/create/ICreateObjectsOperationExecutor.java
index f1e412ed524..63e23347aae 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/create/ICreateObjectsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/create/ICreateObjectsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.common.create;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/delete/DeleteObjectsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/delete/DeleteObjectsOperationExecutor.java
index e8479e1d295..5b5fa126916 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/delete/DeleteObjectsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/delete/DeleteObjectsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.common.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.delete.DeleteObjectsOperation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/delete/IDeleteObjectsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/delete/IDeleteObjectsOperationExecutor.java
index 1c7669e7405..66c3d755417 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/delete/IDeleteObjectsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/delete/IDeleteObjectsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.common.delete;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/AbstractGetObjectsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/AbstractGetObjectsOperationExecutor.java
index 2ced14b81ed..6399637ddb0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/AbstractGetObjectsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/AbstractGetObjectsOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.asapi.v3.executor.common.get;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/AbstractMapObjectByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/AbstractMapObjectByIdExecutor.java
index 6b73fa06306..1745336c3b8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/AbstractMapObjectByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/AbstractMapObjectByIdExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.common.get;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/GetObjectsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/GetObjectsOperationExecutor.java
index ebf3f83088d..e0dcadfb1ff 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/GetObjectsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/GetObjectsOperationExecutor.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.server.asapi.v3.executor.common.get;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/GetObjectsPEOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/GetObjectsPEOperationExecutor.java
index 836f04217dc..ac7f7a84fdd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/GetObjectsPEOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/GetObjectsPEOperationExecutor.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.server.asapi.v3.executor.common.get;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/GetServerInformationOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/GetServerInformationOperationExecutor.java
index 2c48051d38b..6a5826575ef 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/GetServerInformationOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/GetServerInformationOperationExecutor.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.asapi.v3.executor.common.get;
 
 import java.util.Collections;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/GetServerPublicInformationOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/GetServerPublicInformationOperationExecutor.java
index ca8fe183888..9b2d07595b2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/GetServerPublicInformationOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/GetServerPublicInformationOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * 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.
@@ -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.asapi.v3.executor.common.get;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/IGetServerInformationOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/IGetServerInformationOperationExecutor.java
index 0a16338c0f3..5fa1cc1d755 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/IGetServerInformationOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/IGetServerInformationOperationExecutor.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.asapi.v3.executor.common.get;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/IGetServerPublicInformationOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/IGetServerPublicInformationOperationExecutor.java
index 7f5cadc9324..171c818b838 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/IGetServerPublicInformationOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/IGetServerPublicInformationOperationExecutor.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.asapi.v3.executor.common.get;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/IMapObjectByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/IMapObjectByIdExecutor.java
index 76fe9bdc3ba..681a67b61b7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/IMapObjectByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/get/IMapObjectByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.common.get;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/AbstractIdMatcher.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/AbstractIdMatcher.java
index d0fe2e934dc..391d1b6914b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/AbstractIdMatcher.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/AbstractIdMatcher.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.asapi.v3.executor.common.search;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/AbstractIdsMatcher.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/AbstractIdsMatcher.java
index 9a4ab9308be..46d24f6e4f6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/AbstractIdsMatcher.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/AbstractIdsMatcher.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.asapi.v3.executor.common.search;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/AbstractSearchObjectExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/AbstractSearchObjectExecutor.java
index 8df299a2bf6..7e4b2748c39 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/AbstractSearchObjectExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/AbstractSearchObjectExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/AbstractSearchObjectManuallyExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/AbstractSearchObjectManuallyExecutor.java
index 47d12f1133d..c08bc44d4b2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/AbstractSearchObjectManuallyExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/AbstractSearchObjectManuallyExecutor.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.asapi.v3.executor.common.search;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/AbstractSearchObjectsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/AbstractSearchObjectsOperationExecutor.java
index baebbe5b8a6..f6aec78f6cb 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/AbstractSearchObjectsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/AbstractSearchObjectsOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.asapi.v3.executor.common.search;
 
 import static ch.systemsx.cisd.openbis.generic.shared.dto.ColumnNames.ID_COLUMN;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/CacheOptionsVO.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/CacheOptionsVO.java
index 2a20d0cae87..c76d78456a3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/CacheOptionsVO.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/CacheOptionsVO.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.openbis.generic.server.asapi.v3.executor.common.search;
 
 import java.util.Properties;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/CodeMatcher.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/CodeMatcher.java
index 588a6568f00..60cbcef297b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/CodeMatcher.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/CodeMatcher.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.asapi.v3.executor.common.search;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.ICodeHolder;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/CodesMatcher.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/CodesMatcher.java
index be873dda65d..b583a7d59a9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/CodesMatcher.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/CodesMatcher.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.asapi.v3.executor.common.search;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/ISearchObjectExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/ISearchObjectExecutor.java
index 1cfecec7f1a..6755ccc1721 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/ISearchObjectExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/ISearchObjectExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/ISearchObjectsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/ISearchObjectsOperationExecutor.java
index e3fed08d449..8d23d593647 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/ISearchObjectsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/ISearchObjectsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/Matcher.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/Matcher.java
index e18dbe0c398..83ca6547c92 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/Matcher.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/Matcher.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.asapi.v3.executor.common.search;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/NameMatcher.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/NameMatcher.java
index 420734e874f..8f22e1a01f9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/NameMatcher.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/NameMatcher.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.asapi.v3.executor.common.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.INameHolder;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/SearchObjectsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/SearchObjectsOperationExecutor.java
index 367dc37ce2e..1b9e25b2082 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/SearchObjectsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/SearchObjectsOperationExecutor.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.server.asapi.v3.executor.common.search;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/SearchObjectsPEOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/SearchObjectsPEOperationExecutor.java
index 609432a7369..79b49173991 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/SearchObjectsPEOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/SearchObjectsPEOperationExecutor.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.server.asapi.v3.executor.common.search;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/SimpleFieldMatcher.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/SimpleFieldMatcher.java
index e3880026938..2777cdce666 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/SimpleFieldMatcher.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/SimpleFieldMatcher.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.asapi.v3.executor.common.search;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/StringFieldMatcher.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/StringFieldMatcher.java
index 9ba2a7c0690..339650a5e75 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/StringFieldMatcher.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/StringFieldMatcher.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.asapi.v3.executor.common.search;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/CacheManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/CacheManager.java
index d9db5b100d4..4d3784a9a24 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/CacheManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/CacheManager.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.openbis.generic.server.asapi.v3.executor.common.search.cache;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/FileCache.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/FileCache.java
index 3784234dc5e..a893874a2bb 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/FileCache.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/FileCache.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.openbis.generic.server.asapi.v3.executor.common.search.cache;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/ICache.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/ICache.java
index 19326b81e3f..a0566b0fe4f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/ICache.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/ICache.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.openbis.generic.server.asapi.v3.executor.common.search.cache;
 
 public interface ICache<V>
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/ICacheManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/ICacheManager.java
index a2a364721a2..1d87a9daeeb 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/ICacheManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/ICacheManager.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.openbis.generic.server.asapi.v3.executor.common.search.cache;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/ITestableCache.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/ITestableCache.java
index cb6b47ca3b4..81fcaead9fc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/ITestableCache.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/ITestableCache.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.openbis.generic.server.asapi.v3.executor.common.search.cache;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/MemoryCache.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/MemoryCache.java
index 389702bad8e..1b29657ad62 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/MemoryCache.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/MemoryCache.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.openbis.generic.server.asapi.v3.executor.common.search.cache;
 
 import java.util.ArrayDeque;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/update/AssertionOfNoDeletedEntityExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/update/AssertionOfNoDeletedEntityExecutor.java
index c5f6813104e..02d475154c7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/update/AssertionOfNoDeletedEntityExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/update/AssertionOfNoDeletedEntityExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.common.update;
 
 import java.text.SimpleDateFormat;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/update/DeletedEntityRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/update/DeletedEntityRecord.java
index 80f464bd925..ab3b78d4aed 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/update/DeletedEntityRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/update/DeletedEntityRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 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.asapi.v3.executor.common.update;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/update/IAssertionOfNoDeletedEntityExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/update/IAssertionOfNoDeletedEntityExecutor.java
index 703a6f81971..3a60bf6a23b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/update/IAssertionOfNoDeletedEntityExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/update/IAssertionOfNoDeletedEntityExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.common.update;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id.IDataSetId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/update/IDeletedEntityQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/update/IDeletedEntityQuery.java
index 41712324042..aff39092d93 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/update/IDeletedEntityQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/update/IDeletedEntityQuery.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.ethz.sis.openbis.generic.server.asapi.v3.executor.common.update;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/update/IUpdateObjectsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/update/IUpdateObjectsOperationExecutor.java
index 7cc426f9985..eb27e472d32 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/update/IUpdateObjectsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/update/IUpdateObjectsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.common.update;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/update/UpdateFieldWithListUpdateValueExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/update/UpdateFieldWithListUpdateValueExecutor.java
index 8862011de4f..ee93594f5e1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/update/UpdateFieldWithListUpdateValueExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/update/UpdateFieldWithListUpdateValueExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.common.update;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/update/UpdateObjectsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/update/UpdateObjectsOperationExecutor.java
index 965b0b325d3..31e56f5809c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/update/UpdateObjectsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/update/UpdateObjectsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.common.update;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/verify/IVerifyObjectsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/verify/IVerifyObjectsOperationExecutor.java
index eabaad195ba..128de04f1b0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/verify/IVerifyObjectsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/verify/IVerifyObjectsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.common.verify;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/verify/VerifyObjectsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/verify/VerifyObjectsOperationExecutor.java
index 9d291ca122f..aa7cd6ca55b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/verify/VerifyObjectsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/verify/VerifyObjectsOperationExecutor.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.server.asapi.v3.executor.common.verify;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/AbstractArchiveUnarchiveDataSetExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/AbstractArchiveUnarchiveDataSetExecutor.java
index c6a449f1876..9dc27b8a639 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/AbstractArchiveUnarchiveDataSetExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/AbstractArchiveUnarchiveDataSetExecutor.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.server.asapi.v3.executor.dataset;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/AbstractVerifyDataSetCyclesExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/AbstractVerifyDataSetCyclesExecutor.java
index 4353e602885..0c1c2dadcb4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/AbstractVerifyDataSetCyclesExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/AbstractVerifyDataSetCyclesExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.asapi.v3.executor.dataset;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/AddContentCopiesToLinkedDataExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/AddContentCopiesToLinkedDataExecutor.java
index 0c5e013ab92..6bf029b2abf 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/AddContentCopiesToLinkedDataExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/AddContentCopiesToLinkedDataExecutor.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.asapi.v3.executor.dataset;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ArchiveDataSetExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ArchiveDataSetExecutor.java
index 4059e5540b1..7b6eb3d8731 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ArchiveDataSetExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ArchiveDataSetExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ArchiveDataSetsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ArchiveDataSetsOperationExecutor.java
index 4889f67c59f..fb3041413e2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ArchiveDataSetsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ArchiveDataSetsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/CreateDataSetExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/CreateDataSetExecutor.java
index 2e0a15523c6..393143ced88 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/CreateDataSetExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/CreateDataSetExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.asapi.v3.executor.dataset;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/CreateDataSetTypesExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/CreateDataSetTypesExecutor.java
index 1454df00f72..c4ed4ce65dd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/CreateDataSetTypesExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/CreateDataSetTypesExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import org.springframework.beans.factory.InitializingBean;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/CreateDataSetTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/CreateDataSetTypesOperationExecutor.java
index a2708e8e35a..e3eda55135b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/CreateDataSetTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/CreateDataSetTypesOperationExecutor.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.server.asapi.v3.executor.dataset;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/CreateDataSetsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/CreateDataSetsOperationExecutor.java
index 0c578435024..e85b36755ea 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/CreateDataSetsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/CreateDataSetsOperationExecutor.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.server.asapi.v3.executor.dataset;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/DataSetAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/DataSetAuthorizationExecutor.java
index 605a8a5db46..6e2d49e1b34 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/DataSetAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/DataSetAuthorizationExecutor.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.server.asapi.v3.executor.dataset;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/DataSetTypeAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/DataSetTypeAuthorizationExecutor.java
index 10e46f81d10..f2fd145b0f0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/DataSetTypeAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/DataSetTypeAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/DeleteDataSetExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/DeleteDataSetExecutor.java
index a79722466c3..b6610dca26c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/DeleteDataSetExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/DeleteDataSetExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/DeleteDataSetTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/DeleteDataSetTypesOperationExecutor.java
index 52e6462b688..769a537b749 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/DeleteDataSetTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/DeleteDataSetTypesOperationExecutor.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.asapi.v3.executor.dataset;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/DeleteDataSetsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/DeleteDataSetsOperationExecutor.java
index 9c3f3376134..6fa52d065e2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/DeleteDataSetsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/DeleteDataSetsOperationExecutor.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.server.asapi.v3.executor.dataset;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/FileFormatTypeAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/FileFormatTypeAuthorizationExecutor.java
index cdb9ef0250d..3ef3c69cb04 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/FileFormatTypeAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/FileFormatTypeAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/GetDataSetTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/GetDataSetTypesOperationExecutor.java
index 635d83a350e..f0b11eee63e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/GetDataSetTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/GetDataSetTypesOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.asapi.v3.executor.dataset;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/GetDataSetsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/GetDataSetsOperationExecutor.java
index 4287f13061c..254b737550b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/GetDataSetsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/GetDataSetsOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.asapi.v3.executor.dataset;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IAddContentCopiesToLinkedDataExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IAddContentCopiesToLinkedDataExecutor.java
index 775937d2250..5857c1e40a7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IAddContentCopiesToLinkedDataExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IAddContentCopiesToLinkedDataExecutor.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.asapi.v3.executor.dataset;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IArchiveDataSetExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IArchiveDataSetExecutor.java
index ce4ce472683..b5af95b87ef 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IArchiveDataSetExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IArchiveDataSetExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IArchiveDataSetsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IArchiveDataSetsOperationExecutor.java
index 06277893d44..f77b341a533 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IArchiveDataSetsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IArchiveDataSetsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ICreateDataSetExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ICreateDataSetExecutor.java
index cfd4afc3a91..52e2da5f08a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ICreateDataSetExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ICreateDataSetExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.create.DataSetCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ICreateDataSetTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ICreateDataSetTypeExecutor.java
index ca1c688f378..98098644a5d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ICreateDataSetTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ICreateDataSetTypeExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.create.DataSetTypeCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ICreateDataSetTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ICreateDataSetTypesOperationExecutor.java
index 72461fe2151..4a22202424c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ICreateDataSetTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ICreateDataSetTypesOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.create.ICreateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ICreateDataSetsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ICreateDataSetsOperationExecutor.java
index ad6a8d3b944..98f4f0927f0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ICreateDataSetsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ICreateDataSetsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.create.ICreateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IDataSetAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IDataSetAuthorizationExecutor.java
index f41e4979cc0..acbb8336e7a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IDataSetAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IDataSetAuthorizationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id.IDataSetId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IDataSetTypeAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IDataSetTypeAuthorizationExecutor.java
index 1c9ca77781f..6b03b148bc4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IDataSetTypeAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IDataSetTypeAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IDeleteDataSetExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IDeleteDataSetExecutor.java
index 59d898e6be9..49d5ed79aa0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IDeleteDataSetExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IDeleteDataSetExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.delete.DataSetDeletionOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IDeleteDataSetTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IDeleteDataSetTypesOperationExecutor.java
index ee6549ed4f8..7eba02a1d36 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IDeleteDataSetTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IDeleteDataSetTypesOperationExecutor.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.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.delete.IDeleteObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IDeleteDataSetsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IDeleteDataSetsOperationExecutor.java
index 3acf9eda348..f4d39bfb7e3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IDeleteDataSetsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IDeleteDataSetsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.delete.IDeleteObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IFileFormatTypeAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IFileFormatTypeAuthorizationExecutor.java
index f4d7e18776d..fecec8454a5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IFileFormatTypeAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IFileFormatTypeAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IGetDataSetTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IGetDataSetTypesOperationExecutor.java
index 4757ad0f1e5..dc72d173628 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IGetDataSetTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IGetDataSetTypesOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IGetDataSetsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IGetDataSetsOperationExecutor.java
index b7319893767..49fe144fade 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IGetDataSetsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IGetDataSetsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ILocatorTypeAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ILocatorTypeAuthorizationExecutor.java
index af97e1ba3b3..3096bd44ca4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ILocatorTypeAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ILocatorTypeAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ILockDataSetExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ILockDataSetExecutor.java
index 9f857fdbddd..ea61a1b0565 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ILockDataSetExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ILockDataSetExecutor.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.asapi.v3.executor.dataset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ILockDataSetsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ILockDataSetsOperationExecutor.java
index f88d13e6acf..a2d402f7dd8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ILockDataSetsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ILockDataSetsOperationExecutor.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.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IMapDataSetByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IMapDataSetByIdExecutor.java
index 837be889780..b659a7cb603 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IMapDataSetByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IMapDataSetByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id.IDataSetId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IMapDataSetTechIdByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IMapDataSetTechIdByIdExecutor.java
index 59e0b71255a..cd97e50e0ea 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IMapDataSetTechIdByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IMapDataSetTechIdByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id.IDataSetId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IMapFileFormatTypeByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IMapFileFormatTypeByIdExecutor.java
index 47dae8e0fd1..b814441e0f8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IMapFileFormatTypeByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IMapFileFormatTypeByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id.IFileFormatTypeId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IMapLocatorTypeByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IMapLocatorTypeByIdExecutor.java
index 3c415a9c859..b7fb23f57a6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IMapLocatorTypeByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IMapLocatorTypeByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id.ILocatorTypeId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IMapStorageFormatByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IMapStorageFormatByIdExecutor.java
index 166bb4bdbdc..5f67f2581c0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IMapStorageFormatByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IMapStorageFormatByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id.IStorageFormatId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISearchDataSetExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISearchDataSetExecutor.java
index 9db6c907ac5..7ac1148fd86 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISearchDataSetExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISearchDataSetExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.search.DataSetSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISearchDataSetTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISearchDataSetTypeExecutor.java
index d56e316eab9..46fa07ef495 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISearchDataSetTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISearchDataSetTypeExecutor.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.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.search.DataSetTypeSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISearchDataSetTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISearchDataSetTypesOperationExecutor.java
index d7b4f37f45b..7d53b36f1d1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISearchDataSetTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISearchDataSetTypesOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISearchDataSetsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISearchDataSetsOperationExecutor.java
index eea168839ed..cea7d0bc9a4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISearchDataSetsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISearchDataSetsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetChildrenExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetChildrenExecutor.java
index 54080d4d68d..9a33ddf9b52 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetChildrenExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetChildrenExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.create.DataSetCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetComponentsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetComponentsExecutor.java
index e63debdca94..f2f2646f0ef 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetComponentsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetComponentsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.create.DataSetCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetContainerExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetContainerExecutor.java
index 7a80624dc39..e3322204ba1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetContainerExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetContainerExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.create.DataSetCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetDataStoreExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetDataStoreExecutor.java
index fd51c814cdb..f369e13bd3a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetDataStoreExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetDataStoreExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.create.DataSetCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetExperimentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetExperimentExecutor.java
index ec17df32731..719909c3b04 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetExperimentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetExperimentExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.create.DataSetCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetExternalDmsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetExternalDmsExecutor.java
index 04aebac7efb..497c3d0b87f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetExternalDmsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetExternalDmsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.create.DataSetCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetFileFormatTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetFileFormatTypeExecutor.java
index 94502544f53..1078b70e6ff 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetFileFormatTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetFileFormatTypeExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.create.DataSetCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetLinkedDataExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetLinkedDataExecutor.java
index 8cf2884c474..83ac4c5a2e1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetLinkedDataExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetLinkedDataExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.create.DataSetCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetLocatorTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetLocatorTypeExecutor.java
index 458efc4526a..1d8fc7ae917 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetLocatorTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetLocatorTypeExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.create.DataSetCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetParentsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetParentsExecutor.java
index f7a18c3b7c8..b86ade09ac4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetParentsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetParentsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.create.DataSetCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetPhysicalDataExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetPhysicalDataExecutor.java
index edf1f48c03b..e1ec318aa88 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetPhysicalDataExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetPhysicalDataExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.create.DataSetCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetRelatedDataSetsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetRelatedDataSetsExecutor.java
index db0fa941003..07528d7c7d8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetRelatedDataSetsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetRelatedDataSetsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.create.DataSetCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetSampleExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetSampleExecutor.java
index 606d510b0d2..b9fc2c94aa0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetSampleExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetSampleExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.create.DataSetCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetStorageFormatExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetStorageFormatExecutor.java
index a9a1fe34dee..ad479f15c16 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetStorageFormatExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/ISetDataSetStorageFormatExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.create.DataSetCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IStorageFormatAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IStorageFormatAuthorizationExecutor.java
index f66e948d528..87e7f9c7c96 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IStorageFormatAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IStorageFormatAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUnarchiveDataSetExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUnarchiveDataSetExecutor.java
index ccf00b02bd2..839ee684ab4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUnarchiveDataSetExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUnarchiveDataSetExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUnarchiveDataSetsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUnarchiveDataSetsOperationExecutor.java
index 869904202f8..0d13cfb8c98 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUnarchiveDataSetsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUnarchiveDataSetsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUnlockDataSetExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUnlockDataSetExecutor.java
index c76b26e2ce3..ef36549cb65 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUnlockDataSetExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUnlockDataSetExecutor.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.asapi.v3.executor.dataset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUnlockDataSetsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUnlockDataSetsOperationExecutor.java
index 7ee78880ab6..f57301794a4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUnlockDataSetsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUnlockDataSetsOperationExecutor.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.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetChildrenExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetChildrenExecutor.java
index 7c63c06956e..092a697d29a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetChildrenExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetChildrenExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id.IDataSetId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetComponentsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetComponentsExecutor.java
index 43eecf895d1..bf605dd4c8e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetComponentsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetComponentsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id.IDataSetId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetContainersExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetContainersExecutor.java
index e67f18bf56e..a2904a5945d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetContainersExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetContainersExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id.IDataSetId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetExecutor.java
index b52f226aa26..9708ed09dea 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id.DataSetPermId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetExperimentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetExperimentExecutor.java
index 8de25abbad7..d488648620b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetExperimentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetExperimentExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.update.DataSetUpdate;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetExternalDmsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetExternalDmsExecutor.java
index f6eaff99e19..c7a936d4b11 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetExternalDmsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetExternalDmsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.update.DataSetUpdate;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetFileFormatTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetFileFormatTypeExecutor.java
index 29cf4f9712d..93b0f27f254 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetFileFormatTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetFileFormatTypeExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.update.DataSetUpdate;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetLinkedDataExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetLinkedDataExecutor.java
index fb4d7545dbf..9d0d86b1c55 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetLinkedDataExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetLinkedDataExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.update.DataSetUpdate;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetParentsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetParentsExecutor.java
index 670be3de854..bab4f6e2938 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetParentsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetParentsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id.IDataSetId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetPhysicalDataExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetPhysicalDataExecutor.java
index c052b9a5e84..1a2710ed1a7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetPhysicalDataExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetPhysicalDataExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.update.DataSetUpdate;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetPropertyExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetPropertyExecutor.java
index 87c4f5668ab..78329a73f29 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetPropertyExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetPropertyExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.property.IAbstractUpdateEntityPropertyExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetRelatedDataSetsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetRelatedDataSetsExecutor.java
index 1e6eeb95c7c..4bf8bd28d5a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetRelatedDataSetsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetRelatedDataSetsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.update.DataSetUpdate;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetSampleExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetSampleExecutor.java
index 636e598f11f..1935c73a29d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetSampleExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetSampleExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.update.DataSetUpdate;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetTypeExecutor.java
index f2cce794d8e..4b7b13d79a8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetTypeExecutor.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.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.update.DataSetTypeUpdate;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetTypePropertyTypesExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetTypePropertyTypesExecutor.java
index 56ab3e6074f..1fc7d63134b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetTypePropertyTypesExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetTypePropertyTypesExecutor.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.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.update.DataSetTypeUpdate;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetTypesOperationExecutor.java
index c8b6740ad32..0f3cc3aeb1d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetTypesOperationExecutor.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.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.update.IUpdateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetsOperationExecutor.java
index 019b90bce40..1585794b2c6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IUpdateDataSetsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.update.IUpdateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IVerifyDataSetContainersExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IVerifyDataSetContainersExecutor.java
index ee1f30ac2f8..825ae12bede 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IVerifyDataSetContainersExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IVerifyDataSetContainersExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.entity.IVerifyEntityRelationsExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IVerifyDataSetContentCopyExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IVerifyDataSetContentCopyExecutor.java
index 5ee507e18a4..4cc38608ada 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IVerifyDataSetContentCopyExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IVerifyDataSetContentCopyExecutor.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.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IVerifyDataSetExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IVerifyDataSetExecutor.java
index 1e31e0a59c8..75a5ea662f9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IVerifyDataSetExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IVerifyDataSetExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id.IDataSetId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IVerifyDataSetParentsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IVerifyDataSetParentsExecutor.java
index 47ebe8024cf..fdee2b5ffb2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IVerifyDataSetParentsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IVerifyDataSetParentsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.entity.IVerifyEntityRelationsExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IVerifyDataSetSampleAndExperimentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IVerifyDataSetSampleAndExperimentExecutor.java
index 28552059428..2530877758d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IVerifyDataSetSampleAndExperimentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IVerifyDataSetSampleAndExperimentExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.entity.IVerifyEntityRelationsExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IVerifyDataSetsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IVerifyDataSetsOperationExecutor.java
index 7876f9991f6..d53a457ce50 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IVerifyDataSetsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IVerifyDataSetsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.verify.IVerifyObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/LocatorTypeAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/LocatorTypeAuthorizationExecutor.java
index 0e82720a2cd..f65687c15ad 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/LocatorTypeAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/LocatorTypeAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/LockDataSetExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/LockDataSetExecutor.java
index a73abbb43a9..8edf5b75ced 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/LockDataSetExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/LockDataSetExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/LockDataSetsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/LockDataSetsOperationExecutor.java
index a23f4e279e6..359a529c6bc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/LockDataSetsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/LockDataSetsOperationExecutor.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.asapi.v3.executor.dataset;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/MapDataSetByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/MapDataSetByIdExecutor.java
index 9d5d4fbc8e6..a1c6fbd09e7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/MapDataSetByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/MapDataSetByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/MapDataSetTechIdByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/MapDataSetTechIdByIdExecutor.java
index 02be8b7d779..46e45e95fb6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/MapDataSetTechIdByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/MapDataSetTechIdByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/MapFileFormatTypeByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/MapFileFormatTypeByIdExecutor.java
index e67ea185cdc..c3153ae8b99 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/MapFileFormatTypeByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/MapFileFormatTypeByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/MapLocatorTypeByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/MapLocatorTypeByIdExecutor.java
index 9c745f0a581..6c207ed373a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/MapLocatorTypeByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/MapLocatorTypeByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/MapStorageFormatByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/MapStorageFormatByIdExecutor.java
index 389850393f0..ea3f6051e87 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/MapStorageFormatByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/MapStorageFormatByIdExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.dataset;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SearchDataSetExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SearchDataSetExecutor.java
index ccd0ea7799d..706420ec0d5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SearchDataSetExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SearchDataSetExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SearchDataSetTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SearchDataSetTypeExecutor.java
index 842271714de..029c1c79ee6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SearchDataSetTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SearchDataSetTypeExecutor.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.asapi.v3.executor.dataset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SearchDataSetTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SearchDataSetTypesOperationExecutor.java
index 0642ec31fe2..8c807abd048 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SearchDataSetTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SearchDataSetTypesOperationExecutor.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.server.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SearchDataSetsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SearchDataSetsOperationExecutor.java
index 8ac2131c53a..e7c3ec6430d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SearchDataSetsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SearchDataSetsOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.asapi.v3.executor.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetChildrenExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetChildrenExecutor.java
index b20eeece281..7123084170a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetChildrenExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetChildrenExecutor.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.asapi.v3.executor.dataset;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetComponentsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetComponentsExecutor.java
index 3b0559fe854..08f5ae878c7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetComponentsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetComponentsExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.asapi.v3.executor.dataset;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetContainerExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetContainerExecutor.java
index 3ef1fc4ec9c..319b5aad80e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetContainerExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetContainerExecutor.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.asapi.v3.executor.dataset;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetDataStoreExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetDataStoreExecutor.java
index 5f11c1e8d82..3dd9c3bd41a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetDataStoreExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetDataStoreExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetExperimentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetExperimentExecutor.java
index 1211dd97402..1d93059fe7c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetExperimentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetExperimentExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.dataset;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetExternalDmsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetExternalDmsExecutor.java
index f72dd44ce64..6dfa2f5ebbe 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetExternalDmsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetExternalDmsExecutor.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.asapi.v3.executor.dataset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetFileFormatTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetFileFormatTypeExecutor.java
index 070008c749d..de48c01eb38 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetFileFormatTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetFileFormatTypeExecutor.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.asapi.v3.executor.dataset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetLinkedDataExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetLinkedDataExecutor.java
index 5b52dd6dad3..1e6a00631ba 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetLinkedDataExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetLinkedDataExecutor.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.asapi.v3.executor.dataset;
 
 import java.util.HashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetLocatorTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetLocatorTypeExecutor.java
index d18263bf389..8d1947066de 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetLocatorTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetLocatorTypeExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetParentsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetParentsExecutor.java
index 2e535231207..2536ed48225 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetParentsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetParentsExecutor.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.asapi.v3.executor.dataset;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetPhysicalDataExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetPhysicalDataExecutor.java
index 78f995a56bb..403cf7f08ca 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetPhysicalDataExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetPhysicalDataExecutor.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.asapi.v3.executor.dataset;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetSampleExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetSampleExecutor.java
index 02a40e498bf..66cac2af96d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetSampleExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetSampleExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.dataset;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetStorageFormatExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetStorageFormatExecutor.java
index 1bfccdc2d0b..d15f3a3f413 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetStorageFormatExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetStorageFormatExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetToDataSetsRelationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetToDataSetsRelationExecutor.java
index c7fb57d99ce..0264ef3c722 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetToDataSetsRelationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/SetDataSetToDataSetsRelationExecutor.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.asapi.v3.executor.dataset;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/StorageFormatAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/StorageFormatAuthorizationExecutor.java
index 80efc364164..cb26cb72111 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/StorageFormatAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/StorageFormatAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UnarchiveDataSetExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UnarchiveDataSetExecutor.java
index 2bd85f3f2bf..2faa852463d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UnarchiveDataSetExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UnarchiveDataSetExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UnarchiveDataSetsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UnarchiveDataSetsOperationExecutor.java
index 42c5f128a4c..2c14778d3de 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UnarchiveDataSetsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UnarchiveDataSetsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UnlockDataSetExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UnlockDataSetExecutor.java
index d802a38ef4d..5222d1c9822 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UnlockDataSetExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UnlockDataSetExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UnlockDataSetsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UnlockDataSetsOperationExecutor.java
index 24501ecb9a6..00974363372 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UnlockDataSetsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UnlockDataSetsOperationExecutor.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.asapi.v3.executor.dataset;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetChildrenExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetChildrenExecutor.java
index 0a3f122ad71..12fc16f524a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetChildrenExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetChildrenExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.asapi.v3.executor.dataset;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetComponentsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetComponentsExecutor.java
index ba7a669cf4d..ac0345b6418 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetComponentsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetComponentsExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.asapi.v3.executor.dataset;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetContainersExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetContainersExecutor.java
index 4c64e361a78..cb9f02a3423 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetContainersExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetContainersExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.asapi.v3.executor.dataset;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetExecutor.java
index d93567a2fb6..da5f2a31474 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetExperimentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetExperimentExecutor.java
index efdac7b6bae..ee6a768abd1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetExperimentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetExperimentExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.dataset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetExternalDmsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetExternalDmsExecutor.java
index c15e2a4c106..1a3d7ee2787 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetExternalDmsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetExternalDmsExecutor.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.asapi.v3.executor.dataset;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetFileFormatTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetFileFormatTypeExecutor.java
index f587d90fe4f..6c6d1f8bb07 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetFileFormatTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetFileFormatTypeExecutor.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.asapi.v3.executor.dataset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetLinkedDataExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetLinkedDataExecutor.java
index b5128da7923..85d0556c349 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetLinkedDataExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetLinkedDataExecutor.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.asapi.v3.executor.dataset;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetParentsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetParentsExecutor.java
index 4dcf93b4d04..f71e667f243 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetParentsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetParentsExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.asapi.v3.executor.dataset;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetPhysicalDataExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetPhysicalDataExecutor.java
index c9b260806b0..98d4c0c7aca 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetPhysicalDataExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetPhysicalDataExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import java.util.Map.Entry;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetPropertyExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetPropertyExecutor.java
index 14fc4348d7c..54d10fa1a43 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetPropertyExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetPropertyExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetRelatedDataSetsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetRelatedDataSetsExecutor.java
index 4a55775efdd..254c30a7f1e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetRelatedDataSetsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetRelatedDataSetsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetSampleExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetSampleExecutor.java
index a87baa6151d..a8cb8c9cf33 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetSampleExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetSampleExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.dataset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetTypeExecutor.java
index 4fbcf40b9a5..32c7a891cf9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetTypeExecutor.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.asapi.v3.executor.dataset;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetTypePropertyTypesExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetTypePropertyTypesExecutor.java
index f8b740b3864..3a2ece17138 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetTypePropertyTypesExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetTypePropertyTypesExecutor.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.asapi.v3.executor.dataset;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetTypesOperationExecutor.java
index 9ddbe963eab..c79b5b44485 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetTypesOperationExecutor.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.asapi.v3.executor.dataset;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetsOperationExecutor.java
index cba22b06991..ac87daf6e92 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetsOperationExecutor.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.server.asapi.v3.executor.dataset;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/VerifyDataSetContainersExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/VerifyDataSetContainersExecutor.java
index 9e7fc95e76e..a2b0cda2ec5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/VerifyDataSetContainersExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/VerifyDataSetContainersExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/VerifyDataSetContentCopyExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/VerifyDataSetContentCopyExecutor.java
index 9ac4113ae81..ecd7147d221 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/VerifyDataSetContentCopyExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/VerifyDataSetContentCopyExecutor.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.asapi.v3.executor.dataset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/VerifyDataSetExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/VerifyDataSetExecutor.java
index 18afb6bad60..28b518957e8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/VerifyDataSetExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/VerifyDataSetExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/VerifyDataSetParentsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/VerifyDataSetParentsExecutor.java
index a2494ab00e8..42c6e745ba4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/VerifyDataSetParentsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/VerifyDataSetParentsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.dataset;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/VerifyDataSetSampleAndExperimentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/VerifyDataSetSampleAndExperimentExecutor.java
index 1de443ab088..6bd91ac3fa8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/VerifyDataSetSampleAndExperimentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/VerifyDataSetSampleAndExperimentExecutor.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.asapi.v3.executor.dataset;
 
 import java.util.Properties;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/VerifyDataSetsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/VerifyDataSetsOperationExecutor.java
index 86b716cc711..136135c4b4c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/VerifyDataSetsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/VerifyDataSetsOperationExecutor.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.server.asapi.v3.executor.dataset;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/DataStoreAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/DataStoreAuthorizationExecutor.java
index 8e7bc22748e..9f5b6ee299b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/DataStoreAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/DataStoreAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.datastore;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/IDataStoreAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/IDataStoreAuthorizationExecutor.java
index 59b7ed56202..52774ce5a32 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/IDataStoreAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/IDataStoreAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.datastore;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/IMapDataStoreByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/IMapDataStoreByIdExecutor.java
index f84e4517281..e143591cbb4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/IMapDataStoreByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/IMapDataStoreByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.datastore;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.datastore.id.IDataStoreId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/ISearchDataStoreExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/ISearchDataStoreExecutor.java
index 4ee3e515fa8..dc136e3e691 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/ISearchDataStoreExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/ISearchDataStoreExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.datastore;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.datastore.search.DataStoreSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/ISearchDataStoresOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/ISearchDataStoresOperationExecutor.java
index c863a4e5066..d6467ebc1c1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/ISearchDataStoresOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/ISearchDataStoresOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.datastore;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/MapDataStoreByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/MapDataStoreByIdExecutor.java
index 0a6e7e470ab..8bd5d656456 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/MapDataStoreByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/MapDataStoreByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.datastore;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/SearchDataStoreExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/SearchDataStoreExecutor.java
index ff7b80b4a09..c4928f2af87 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/SearchDataStoreExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/SearchDataStoreExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.datastore;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/SearchDataStoresOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/SearchDataStoresOperationExecutor.java
index f8e1cbbd517..9edc6a0fe9e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/SearchDataStoresOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/datastore/SearchDataStoresOperationExecutor.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.server.asapi.v3.executor.datastore;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.search.planner.ILocalSearchManager;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/ConfirmDeletionExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/ConfirmDeletionExecutor.java
index a1be37d8d3e..4b5befc1268 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/ConfirmDeletionExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/ConfirmDeletionExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.deletion;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/ConfirmDeletionsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/ConfirmDeletionsOperationExecutor.java
index 4f0f62f2fcc..76cf4c35201 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/ConfirmDeletionsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/ConfirmDeletionsOperationExecutor.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.server.asapi.v3.executor.deletion;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/DeletionAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/DeletionAuthorizationExecutor.java
index 67a7b3c631b..aeddbf1862c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/DeletionAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/DeletionAuthorizationExecutor.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.server.asapi.v3.executor.deletion;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/IConfirmDeletionExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/IConfirmDeletionExecutor.java
index 5e78a2d9234..400ee55e991 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/IConfirmDeletionExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/IConfirmDeletionExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.deletion;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/IConfirmDeletionsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/IConfirmDeletionsOperationExecutor.java
index 286b71407bf..0e58d72e59c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/IConfirmDeletionsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/IConfirmDeletionsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.deletion;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/IDeletionAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/IDeletionAuthorizationExecutor.java
index 5415820b36f..f6331a5b748 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/IDeletionAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/IDeletionAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.deletion;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/IMapDeletionByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/IMapDeletionByIdExecutor.java
index e5992d5e2e9..921171afd78 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/IMapDeletionByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/IMapDeletionByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.deletion;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.id.IDeletionId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/IRevertDeletionExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/IRevertDeletionExecutor.java
index 1054bbe93da..51c558fb89c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/IRevertDeletionExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/IRevertDeletionExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.deletion;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/IRevertDeletionsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/IRevertDeletionsOperationExecutor.java
index 1acbfc1d2fd..66db0b5d21f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/IRevertDeletionsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/IRevertDeletionsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.deletion;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/ISearchDeletionExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/ISearchDeletionExecutor.java
index cb0b7aa2d5b..02e4186daa5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/ISearchDeletionExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/ISearchDeletionExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.deletion;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/ISearchDeletionsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/ISearchDeletionsOperationExecutor.java
index af11854ed07..fb3162b2e45 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/ISearchDeletionsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/ISearchDeletionsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.deletion;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/MapDeletionByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/MapDeletionByIdExecutor.java
index 460ed66b0c6..37862a1635c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/MapDeletionByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/MapDeletionByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.deletion;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/RevertDeletionExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/RevertDeletionExecutor.java
index 0ec7d22affb..e700d05a4e2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/RevertDeletionExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/RevertDeletionExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.deletion;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/RevertDeletionsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/RevertDeletionsOperationExecutor.java
index d0ab1a8e83b..db3abdd55f7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/RevertDeletionsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/RevertDeletionsOperationExecutor.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.server.asapi.v3.executor.deletion;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/SearchDeletionExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/SearchDeletionExecutor.java
index d594c519cee..48b5c5c2759 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/SearchDeletionExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/SearchDeletionExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.deletion;
 
 import java.util.Collections;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/SearchDeletionsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/SearchDeletionsOperationExecutor.java
index 0d28d06f8f8..91c698264ac 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/SearchDeletionsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/SearchDeletionsOperationExecutor.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.server.asapi.v3.executor.deletion;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractCreateEntityExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractCreateEntityExecutor.java
index ee98b638d1d..7dc4b0edaba 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractCreateEntityExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractCreateEntityExecutor.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.asapi.v3.executor.entity;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractCreateEntityTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractCreateEntityTypeExecutor.java
index 2f4ac0f3e18..e2b6de2ed5c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractCreateEntityTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractCreateEntityTypeExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.entity;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractDeleteEntityExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractDeleteEntityExecutor.java
index f66d40c6f91..f991677bd4e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractDeleteEntityExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractDeleteEntityExecutor.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.asapi.v3.executor.entity;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractGetEntityTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractGetEntityTypesOperationExecutor.java
index 81f64cbf501..fc2cbbf62bf 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractGetEntityTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractGetEntityTypesOperationExecutor.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.asapi.v3.executor.entity;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractSearchEntityTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractSearchEntityTypeExecutor.java
index c60e14344ec..8d5321ee3e9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractSearchEntityTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractSearchEntityTypeExecutor.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.asapi.v3.executor.entity;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractSetEntityExperimentRelationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractSetEntityExperimentRelationExecutor.java
index 7409c86efd7..4150fd1164f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractSetEntityExperimentRelationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractSetEntityExperimentRelationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.executor.entity;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractSetEntitySampleRelationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractSetEntitySampleRelationExecutor.java
index 1ae1b10dc0b..26749cefd9b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractSetEntitySampleRelationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractSetEntitySampleRelationExecutor.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.asapi.v3.executor.entity;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractSetEntityToManyRelationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractSetEntityToManyRelationExecutor.java
index f7d3b5ab5bd..452bac9f709 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractSetEntityToManyRelationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractSetEntityToManyRelationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.asapi.v3.executor.entity;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractSetEntityToOneRelationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractSetEntityToOneRelationExecutor.java
index e2bf5b62f9d..e54ebaa110c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractSetEntityToOneRelationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractSetEntityToOneRelationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.entity;
 
 import java.util.LinkedList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityExecutor.java
index 927d97c244f..7fdf8dce2b4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityExecutor.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.asapi.v3.executor.entity;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityMultipleRelationsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityMultipleRelationsExecutor.java
index f39694b0db9..49b94725474 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityMultipleRelationsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityMultipleRelationsExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.entity;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityToManyRelationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityToManyRelationExecutor.java
index 88bc8adf08b..2b2afaaeb62 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityToManyRelationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityToManyRelationExecutor.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.asapi.v3.executor.entity;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityToOneRelationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityToOneRelationExecutor.java
index d8640ff1203..858922c7bf3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityToOneRelationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityToOneRelationExecutor.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.asapi.v3.executor.entity;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityTypeExecutor.java
index 8d5498d7946..1d663e56297 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityTypeExecutor.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.asapi.v3.executor.entity;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityTypePropertyTypesExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityTypePropertyTypesExecutor.java
index b737671e3f8..32d93872628 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityTypePropertyTypesExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityTypePropertyTypesExecutor.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.asapi.v3.executor.entity;
 
 import java.util.*;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractVerifyEntityCyclesExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractVerifyEntityCyclesExecutor.java
index e716dc3e042..86b99ef274d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractVerifyEntityCyclesExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractVerifyEntityCyclesExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.asapi.v3.executor.entity;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/CreateCodesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/CreateCodesOperationExecutor.java
index 71866a2dd66..a9fdbe1432b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/CreateCodesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/CreateCodesOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.asapi.v3.executor.entity;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/CreatePermIdsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/CreatePermIdsOperationExecutor.java
index 9e5258d7bbe..9502902ac95 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/CreatePermIdsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/CreatePermIdsOperationExecutor.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.asapi.v3.executor.entity;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/CreatePropertyAssignmentsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/CreatePropertyAssignmentsExecutor.java
index 5e508e34b3f..c62748dedbd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/CreatePropertyAssignmentsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/CreatePropertyAssignmentsExecutor.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.asapi.v3.executor.entity;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/DeleteEntityTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/DeleteEntityTypeExecutor.java
index ed17b9bc7c5..e045f66f2bb 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/DeleteEntityTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/DeleteEntityTypeExecutor.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.asapi.v3.executor.entity;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/EntityAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/EntityAuthorizationExecutor.java
index 7b06c548814..5a1135eac3c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/EntityAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/EntityAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.entity;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/ICreateCodesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/ICreateCodesOperationExecutor.java
index 5ce24711aba..f31276a3e8a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/ICreateCodesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/ICreateCodesOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.entity;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.create.ICreateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/ICreateEntityExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/ICreateEntityExecutor.java
index 636bc7af54b..52fa703d5e1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/ICreateEntityExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/ICreateEntityExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.entity;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/ICreatePermIdsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/ICreatePermIdsOperationExecutor.java
index f527d111854..40980e6a089 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/ICreatePermIdsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/ICreatePermIdsOperationExecutor.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.asapi.v3.executor.entity;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.create.ICreateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IDeleteEntityExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IDeleteEntityExecutor.java
index e31396c541b..af6c3d00068 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IDeleteEntityExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IDeleteEntityExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.entity;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IDeleteEntityTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IDeleteEntityTypeExecutor.java
index 9bc14d996e7..479cf5a1b64 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IDeleteEntityTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IDeleteEntityTypeExecutor.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.asapi.v3.executor.entity;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.AbstractObjectDeletionOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IEntityAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IEntityAuthorizationExecutor.java
index 079e6c461cb..e5e4054af44 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IEntityAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IEntityAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.entity;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IMapEntityTypeByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IMapEntityTypeByIdExecutor.java
index 76ada332a26..7088876485e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IMapEntityTypeByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IMapEntityTypeByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.entity;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IPluginIdProvider.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IPluginIdProvider.java
index 8c6740e3d51..b43b1989b4a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IPluginIdProvider.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IPluginIdProvider.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.asapi.v3.executor.entity;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.plugin.id.IPluginId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IReindexEntityExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IReindexEntityExecutor.java
index 743691b1f0d..80deb8fd060 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IReindexEntityExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IReindexEntityExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.entity;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/ISearchEntityTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/ISearchEntityTypeExecutor.java
index 42e39c5b7d0..91f73249828 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/ISearchEntityTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/ISearchEntityTypeExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.entity;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.search.EntityTypeSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/ISetEntityRelationsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/ISetEntityRelationsExecutor.java
index 927aa6169c0..6c9bc65d347 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/ISetEntityRelationsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/ISetEntityRelationsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.entity;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IUpdateEntityExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IUpdateEntityExecutor.java
index 102a7050ace..69c231a957e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IUpdateEntityExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IUpdateEntityExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.entity;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IUpdateEntityRelationsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IUpdateEntityRelationsExecutor.java
index 67779694b29..be290982ba4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IUpdateEntityRelationsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IUpdateEntityRelationsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.entity;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IUpdateEntityRelationsWithCacheExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IUpdateEntityRelationsWithCacheExecutor.java
index 5d749a8687c..13d4994508d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IUpdateEntityRelationsWithCacheExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IUpdateEntityRelationsWithCacheExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.entity;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IUpdateEntityTypePropertyTypesExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IUpdateEntityTypePropertyTypesExecutor.java
index 8bdf49ec37b..d95763166d1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IUpdateEntityTypePropertyTypesExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IUpdateEntityTypePropertyTypesExecutor.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.asapi.v3.executor.entity;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.update.IEntityTypeUpdate;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IVerifyEntityRelationsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IVerifyEntityRelationsExecutor.java
index c709220ba1a..ee8a439477c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IVerifyEntityRelationsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/IVerifyEntityRelationsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.entity;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/MapEntityTypeByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/MapEntityTypeByIdExecutor.java
index 4fee495481c..c9cb83162cd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/MapEntityTypeByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/MapEntityTypeByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.entity;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/ReindexEntityExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/ReindexEntityExecutor.java
index 968ca40d7d2..778b997859a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/ReindexEntityExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/ReindexEntityExecutor.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.server.asapi.v3.executor.entity;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/SearchEntityTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/SearchEntityTypeExecutor.java
index 5d074835f9d..98de6cacede 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/SearchEntityTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/SearchEntityTypeExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.executor.entity;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/SetEntityTypeValidationScriptExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/SetEntityTypeValidationScriptExecutor.java
index 2cde55dc43f..b6e9d1536f5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/SetEntityTypeValidationScriptExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/SetEntityTypeValidationScriptExecutor.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.asapi.v3.executor.entity;
 
 import java.util.HashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/event/EventAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/event/EventAuthorizationExecutor.java
index 7a4e67c3ee2..b777adde184 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/event/EventAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/event/EventAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.event;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/event/IEventAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/event/IEventAuthorizationExecutor.java
index a5aaf34cea9..f72cfa4cf50 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/event/IEventAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/event/IEventAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.event;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/event/ISearchEventExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/event/ISearchEventExecutor.java
index bf5cbd24b7f..cfdc197c940 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/event/ISearchEventExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/event/ISearchEventExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.event;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.event.fetchoptions.EventFetchOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/event/ISearchEventsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/event/ISearchEventsOperationExecutor.java
index 27eeb329cba..00a6bc5214e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/event/ISearchEventsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/event/ISearchEventsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.event;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/event/SearchEventExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/event/SearchEventExecutor.java
index 534f11384c5..e07b7d2ef38 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/event/SearchEventExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/event/SearchEventExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.event;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.event.fetchoptions.EventFetchOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/event/SearchEventsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/event/SearchEventsOperationExecutor.java
index 92e313be28a..ba602854cf9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/event/SearchEventsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/event/SearchEventsOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, CISD
+ * 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.
@@ -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.asapi.v3.executor.event;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/CreateExperimentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/CreateExperimentExecutor.java
index 77333e3dead..bbb97b4d0b7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/CreateExperimentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/CreateExperimentExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/CreateExperimentTypesExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/CreateExperimentTypesExecutor.java
index ef5f11d92b7..edf5470e548 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/CreateExperimentTypesExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/CreateExperimentTypesExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/CreateExperimentTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/CreateExperimentTypesOperationExecutor.java
index 3640af6ecb1..893e6c0aa3a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/CreateExperimentTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/CreateExperimentTypesOperationExecutor.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.server.asapi.v3.executor.experiment;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/CreateExperimentsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/CreateExperimentsOperationExecutor.java
index 8c9cc5648ff..f915be295ae 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/CreateExperimentsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/CreateExperimentsOperationExecutor.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.server.asapi.v3.executor.experiment;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/DeleteExperimentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/DeleteExperimentExecutor.java
index b960c6da76d..c5ced25c7a7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/DeleteExperimentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/DeleteExperimentExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/DeleteExperimentTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/DeleteExperimentTypesOperationExecutor.java
index a6fa01b78b3..8520adcde08 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/DeleteExperimentTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/DeleteExperimentTypesOperationExecutor.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.asapi.v3.executor.experiment;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/DeleteExperimentsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/DeleteExperimentsOperationExecutor.java
index 9d030266681..638023ae77e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/DeleteExperimentsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/DeleteExperimentsOperationExecutor.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.server.asapi.v3.executor.experiment;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ExperimentAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ExperimentAuthorizationExecutor.java
index f92187b3aec..e12d4f641ab 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ExperimentAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ExperimentAuthorizationExecutor.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.server.asapi.v3.executor.experiment;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ExperimentTypeAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ExperimentTypeAuthorizationExecutor.java
index 2ece4d38780..c22513fbe0c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ExperimentTypeAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ExperimentTypeAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/GetExperimentTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/GetExperimentTypesOperationExecutor.java
index b999b02d934..7683a24fef9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/GetExperimentTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/GetExperimentTypesOperationExecutor.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.server.asapi.v3.executor.experiment;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/GetExperimentsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/GetExperimentsOperationExecutor.java
index bbe6ff88798..f9c252f1512 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/GetExperimentsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/GetExperimentsOperationExecutor.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.server.asapi.v3.executor.experiment;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ICreateExperimentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ICreateExperimentExecutor.java
index 3fe218e4f40..4ea255a2761 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ICreateExperimentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ICreateExperimentExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.create.ExperimentCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ICreateExperimentTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ICreateExperimentTypeExecutor.java
index 4d2fdbd1013..a0b62cabf39 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ICreateExperimentTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ICreateExperimentTypeExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.id.EntityTypePermId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ICreateExperimentTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ICreateExperimentTypesOperationExecutor.java
index 240a97ab6a4..76b7cf11bc0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ICreateExperimentTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ICreateExperimentTypesOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.create.ICreateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ICreateExperimentsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ICreateExperimentsOperationExecutor.java
index 9b857a3145b..24e7e886333 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ICreateExperimentsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ICreateExperimentsOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.create.ICreateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IDeleteExperimentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IDeleteExperimentExecutor.java
index 7d7d8ced606..7d6507afe50 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IDeleteExperimentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IDeleteExperimentExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.id.IDeletionId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IDeleteExperimentTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IDeleteExperimentTypesOperationExecutor.java
index e929e431e20..5bc27836226 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IDeleteExperimentTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IDeleteExperimentTypesOperationExecutor.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.asapi.v3.executor.experiment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.delete.IDeleteObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IDeleteExperimentsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IDeleteExperimentsOperationExecutor.java
index 3321950e0d4..902a68e73a2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IDeleteExperimentsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IDeleteExperimentsOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.delete.IDeleteObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IExperimentAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IExperimentAuthorizationExecutor.java
index 0e9632a52ef..be126cebf66 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IExperimentAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IExperimentAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.id.IExperimentId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IExperimentTypeAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IExperimentTypeAuthorizationExecutor.java
index 5871a8b7487..933924296cb 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IExperimentTypeAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IExperimentTypeAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IGetExperimentTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IGetExperimentTypesOperationExecutor.java
index d4aa5717f79..d194f910c6c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IGetExperimentTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IGetExperimentTypesOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IGetExperimentsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IGetExperimentsOperationExecutor.java
index e749b879aef..adcd68f4773 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IGetExperimentsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IGetExperimentsOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IMapExperimentByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IMapExperimentByIdExecutor.java
index 96825edeb62..6bb3e1b9ab2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IMapExperimentByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IMapExperimentByIdExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.id.IExperimentId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ISearchExperimentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ISearchExperimentExecutor.java
index 26cde2be554..ce66061ac6b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ISearchExperimentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ISearchExperimentExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.search.ExperimentSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ISearchExperimentTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ISearchExperimentTypeExecutor.java
index e2123ec74cf..7e5cf3fba4c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ISearchExperimentTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ISearchExperimentTypeExecutor.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.asapi.v3.executor.experiment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.search.ExperimentTypeSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ISearchExperimentTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ISearchExperimentTypesOperationExecutor.java
index 8ef848ddf3d..310b3457287 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ISearchExperimentTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ISearchExperimentTypesOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ISearchExperimentsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ISearchExperimentsOperationExecutor.java
index 230b1c77463..b8abe236372 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ISearchExperimentsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ISearchExperimentsOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ISetExperimentProjectExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ISetExperimentProjectExecutor.java
index e8e7d8a714c..50a9149144b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ISetExperimentProjectExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ISetExperimentProjectExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.create.ExperimentCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ISetExperimentTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ISetExperimentTypeExecutor.java
index 620fc643ce5..a3a37198c44 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ISetExperimentTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ISetExperimentTypeExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.create.ExperimentCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentAttachmentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentAttachmentExecutor.java
index ef582717955..2bf4a25de94 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentAttachmentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentAttachmentExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.attachment.IAbstractUpdateAttachmentForEntityExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentExecutor.java
index 6ebe46ffc66..eb97327ef50 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.id.ExperimentPermId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentProjectExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentProjectExecutor.java
index 6727b4db7e2..74f586b66fc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentProjectExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentProjectExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.update.ExperimentUpdate;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentPropertyExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentPropertyExecutor.java
index 0059e5153ca..551ba81a2c4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentPropertyExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentPropertyExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.property.IAbstractUpdateEntityPropertyExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentTypeExecutor.java
index 33a0ac75e43..b62bc0184ad 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentTypeExecutor.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.asapi.v3.executor.experiment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.id.EntityTypePermId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentTypePropertyTypesExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentTypePropertyTypesExecutor.java
index 9acb15cae15..d6a7292458a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentTypePropertyTypesExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentTypePropertyTypesExecutor.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.asapi.v3.executor.experiment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.update.ExperimentTypeUpdate;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentTypesOperationExecutor.java
index 6128f15f6fe..2e7945a114a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentTypesOperationExecutor.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.asapi.v3.executor.experiment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.update.IUpdateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentsOperationExecutor.java
index de9232b88be..1b6c0bf4dcc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IUpdateExperimentsOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.update.IUpdateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IVerifyExperimentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IVerifyExperimentExecutor.java
index 520802822a7..949fc120f40 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IVerifyExperimentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IVerifyExperimentExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.id.IExperimentId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IVerifyExperimentsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IVerifyExperimentsOperationExecutor.java
index cec2d7064e1..420502376a5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IVerifyExperimentsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IVerifyExperimentsOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.verify.IVerifyObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/MapExperimentByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/MapExperimentByIdExecutor.java
index d17fe5a8b66..e9ad9e30fda 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/MapExperimentByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/MapExperimentByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/SearchExperimentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/SearchExperimentExecutor.java
index 2ffe5d5e42c..b7a03fce524 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/SearchExperimentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/SearchExperimentExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/SearchExperimentTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/SearchExperimentTypeExecutor.java
index a3da79c99f3..82e102b3cde 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/SearchExperimentTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/SearchExperimentTypeExecutor.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.asapi.v3.executor.experiment;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/SearchExperimentTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/SearchExperimentTypesOperationExecutor.java
index 39b69eab319..16eed1dc5a5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/SearchExperimentTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/SearchExperimentTypesOperationExecutor.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.server.asapi.v3.executor.experiment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/SearchExperimentsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/SearchExperimentsOperationExecutor.java
index 16bf898a71f..c5fe5137d3b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/SearchExperimentsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/SearchExperimentsOperationExecutor.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.server.asapi.v3.executor.experiment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/SetExperimentProjectExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/SetExperimentProjectExecutor.java
index 1022af19d9c..adaf780475a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/SetExperimentProjectExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/SetExperimentProjectExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.experiment;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/SetExperimentTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/SetExperimentTypeExecutor.java
index eab13b05acf..a4db9f64b24 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/SetExperimentTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/SetExperimentTypeExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentAttachmentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentAttachmentExecutor.java
index 0e3de427097..d992d8b6cd1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentAttachmentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentAttachmentExecutor.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.asapi.v3.executor.experiment;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentExecutor.java
index fdf0cffdf45..6958cc94660 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentProjectExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentProjectExecutor.java
index efc1a3a4911..b100001b9cc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentProjectExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentProjectExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentPropertyExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentPropertyExecutor.java
index 81190957ed2..b2f31a2c02d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentPropertyExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentPropertyExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentTypeExecutor.java
index 71fe28347d3..7943c226ac0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentTypeExecutor.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.asapi.v3.executor.experiment;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentTypePropertyTypesExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentTypePropertyTypesExecutor.java
index b2cdc5a083b..c1645e17df4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentTypePropertyTypesExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentTypePropertyTypesExecutor.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.asapi.v3.executor.experiment;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentTypesOperationExecutor.java
index fb9728c2cd1..71687dc0540 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentTypesOperationExecutor.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.asapi.v3.executor.experiment;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentsOperationExecutor.java
index 9fc91bd44b9..39f6bea8887 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentsOperationExecutor.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.server.asapi.v3.executor.experiment;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/VerifyExperimentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/VerifyExperimentExecutor.java
index f22c280f1f7..f00848ad307 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/VerifyExperimentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/VerifyExperimentExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/VerifyExperimentsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/VerifyExperimentsOperationExecutor.java
index 722955c8c5f..f56622dddf6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/VerifyExperimentsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/VerifyExperimentsOperationExecutor.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.server.asapi.v3.executor.experiment;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/AddressMatcher.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/AddressMatcher.java
index 0d578eda088..9a524253ac4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/AddressMatcher.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/AddressMatcher.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.asapi.v3.executor.externaldms;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.StringFieldMatcher;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/CreateExternalDmsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/CreateExternalDmsExecutor.java
index adde6f824c2..acd1bc7b7f2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/CreateExternalDmsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/CreateExternalDmsExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/CreateExternalDmsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/CreateExternalDmsOperationExecutor.java
index d7df14bd2c2..77f1cbdcef0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/CreateExternalDmsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/CreateExternalDmsOperationExecutor.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.server.asapi.v3.executor.externaldms;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/DeleteExternalDmsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/DeleteExternalDmsExecutor.java
index c893f133776..e051b722f91 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/DeleteExternalDmsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/DeleteExternalDmsExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.externaldms;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/DeleteExternalDmsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/DeleteExternalDmsOperationExecutor.java
index ca7a8e304fc..7ce475295e3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/DeleteExternalDmsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/DeleteExternalDmsOperationExecutor.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.server.asapi.v3.executor.externaldms;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/ExternalDmsAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/ExternalDmsAuthorizationExecutor.java
index 6330c653ff5..1ca7e7fc85a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/ExternalDmsAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/ExternalDmsAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.externaldms;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/ExternalDmsTypeMatcher.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/ExternalDmsTypeMatcher.java
index 5c3798b3c81..42bdf85826f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/ExternalDmsTypeMatcher.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/ExternalDmsTypeMatcher.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.asapi.v3.executor.externaldms;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/GetExternalDmsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/GetExternalDmsOperationExecutor.java
index 6032a497704..d7da1b684d9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/GetExternalDmsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/GetExternalDmsOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.executor.externaldms;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/ICreateExternalDmsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/ICreateExternalDmsExecutor.java
index b2cb8d9bef7..a8a55528768 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/ICreateExternalDmsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/ICreateExternalDmsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.externaldms;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.externaldms.create.ExternalDmsCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/ICreateExternalDmsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/ICreateExternalDmsOperationExecutor.java
index 0d9b38b5e42..404a9e62e55 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/ICreateExternalDmsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/ICreateExternalDmsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.externaldms;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.create.ICreateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IDeleteExternalDmsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IDeleteExternalDmsExecutor.java
index c403126c7a2..610fc7687ff 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IDeleteExternalDmsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IDeleteExternalDmsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.externaldms;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.externaldms.delete.ExternalDmsDeletionOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IDeleteExternalDmsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IDeleteExternalDmsOperationExecutor.java
index fe7921e5381..bdbbb68376e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IDeleteExternalDmsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IDeleteExternalDmsOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.executor.externaldms;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.delete.IDeleteObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IExternalDmsAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IExternalDmsAuthorizationExecutor.java
index 7ca5ebe4148..9f043e9610e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IExternalDmsAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IExternalDmsAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.externaldms;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IGetExternalDmsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IGetExternalDmsOperationExecutor.java
index f19d61c05f7..4987b4c23be 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IGetExternalDmsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IGetExternalDmsOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.executor.externaldms;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IMapExternalDmsByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IMapExternalDmsByIdExecutor.java
index 27b09beb09e..3f709b4756e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IMapExternalDmsByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IMapExternalDmsByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.externaldms;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.externaldms.id.IExternalDmsId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IMapExternalDmsTechIdByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IMapExternalDmsTechIdByIdExecutor.java
index 4123cf39231..68cf22dfe85 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IMapExternalDmsTechIdByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IMapExternalDmsTechIdByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.externaldms;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.externaldms.id.IExternalDmsId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/ISearchExternalDmsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/ISearchExternalDmsExecutor.java
index 8025a531f28..097d8d07f5a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/ISearchExternalDmsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/ISearchExternalDmsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.externaldms;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.externaldms.search.ExternalDmsSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/ISearchExternalDmsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/ISearchExternalDmsOperationExecutor.java
index fe7b0be17fd..37aff66e448 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/ISearchExternalDmsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/ISearchExternalDmsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.externaldms;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IUpdateExternalDmsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IUpdateExternalDmsExecutor.java
index ce825766250..7b065c8954b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IUpdateExternalDmsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IUpdateExternalDmsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.externaldms;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.externaldms.id.ExternalDmsPermId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IUpdateExternalDmsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IUpdateExternalDmsOperationExecutor.java
index 112cd91d041..22c19023bd0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IUpdateExternalDmsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/IUpdateExternalDmsOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.executor.externaldms;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.update.IUpdateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/LabelMatcher.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/LabelMatcher.java
index 93a0a550962..13b1168f4e5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/LabelMatcher.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/LabelMatcher.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.asapi.v3.executor.externaldms;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.StringFieldMatcher;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/MapExternalDmsByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/MapExternalDmsByIdExecutor.java
index 7086cc15e90..d06b7d2f794 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/MapExternalDmsByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/MapExternalDmsByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.externaldms;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/MapExternalDmsTechIdByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/MapExternalDmsTechIdByIdExecutor.java
index c18113013dd..77265f86a18 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/MapExternalDmsTechIdByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/MapExternalDmsTechIdByIdExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.executor.externaldms;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/SearchExternalDmsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/SearchExternalDmsExecutor.java
index 8b9147c1dc3..a3fb8cda649 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/SearchExternalDmsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/SearchExternalDmsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.externaldms;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/SearchExternalDmsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/SearchExternalDmsOperationExecutor.java
index 5b7e6acab27..3f524792046 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/SearchExternalDmsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/SearchExternalDmsOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.executor.externaldms;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.search.planner.ILocalSearchManager;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/UpdateExternalDmsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/UpdateExternalDmsExecutor.java
index a5c62fbfe4d..ca0e423fe86 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/UpdateExternalDmsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/UpdateExternalDmsExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.ethz.sis.openbis.generic.server.asapi.v3.executor.externaldms;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/UpdateExternalDmsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/UpdateExternalDmsOperationExecutor.java
index 24c691859fe..219fc17a21b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/UpdateExternalDmsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/externaldms/UpdateExternalDmsOperationExecutor.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.server.asapi.v3.executor.externaldms;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/globalsearch/GlobalAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/globalsearch/GlobalAuthorizationExecutor.java
index e422aa85a95..087f850df5b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/globalsearch/GlobalAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/globalsearch/GlobalAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.globalsearch;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/globalsearch/GlobalSearchExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/globalsearch/GlobalSearchExecutor.java
index bb7539befe8..0ef1a854255 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/globalsearch/GlobalSearchExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/globalsearch/GlobalSearchExecutor.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.server.asapi.v3.executor.globalsearch;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/globalsearch/IGlobalAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/globalsearch/IGlobalAuthorizationExecutor.java
index 371e0fdfcb8..4705daedd92 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/globalsearch/IGlobalAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/globalsearch/IGlobalAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.globalsearch;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/globalsearch/IGlobalSearchExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/globalsearch/IGlobalSearchExecutor.java
index 364926b3f75..674323de728 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/globalsearch/IGlobalSearchExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/globalsearch/IGlobalSearchExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.globalsearch;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.global.search.GlobalSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/globalsearch/ISearchGloballyOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/globalsearch/ISearchGloballyOperationExecutor.java
index 3bcee8a7af6..f6a4bd1fdcc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/globalsearch/ISearchGloballyOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/globalsearch/ISearchGloballyOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.globalsearch;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/globalsearch/SearchGloballyOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/globalsearch/SearchGloballyOperationExecutor.java
index ee988a1931a..a812e2eb957 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/globalsearch/SearchGloballyOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/globalsearch/SearchGloballyOperationExecutor.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.server.asapi.v3.executor.globalsearch;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/CreateMaterialExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/CreateMaterialExecutor.java
index f3066a66a66..1fe8d50e454 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/CreateMaterialExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/CreateMaterialExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.asapi.v3.executor.material;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/CreateMaterialTypesExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/CreateMaterialTypesExecutor.java
index 091a72f656b..9444e2922e1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/CreateMaterialTypesExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/CreateMaterialTypesExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.ethz.sis.openbis.generic.server.asapi.v3.executor.material;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/CreateMaterialTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/CreateMaterialTypesOperationExecutor.java
index 40c07c6a2f9..2f87c109db8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/CreateMaterialTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/CreateMaterialTypesOperationExecutor.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.server.asapi.v3.executor.material;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/CreateMaterialsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/CreateMaterialsOperationExecutor.java
index 7b3926a216d..6e0bb59a6a5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/CreateMaterialsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/CreateMaterialsOperationExecutor.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.server.asapi.v3.executor.material;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/DeleteMaterialExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/DeleteMaterialExecutor.java
index c38f60ff37b..04f1e6595a1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/DeleteMaterialExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/DeleteMaterialExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.material;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/DeleteMaterialTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/DeleteMaterialTypesOperationExecutor.java
index d51f64ba8f9..710093a807d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/DeleteMaterialTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/DeleteMaterialTypesOperationExecutor.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.asapi.v3.executor.material;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/DeleteMaterialsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/DeleteMaterialsOperationExecutor.java
index ce2b452e504..4bb3e572814 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/DeleteMaterialsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/DeleteMaterialsOperationExecutor.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.server.asapi.v3.executor.material;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/GetMaterialTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/GetMaterialTypesOperationExecutor.java
index 39a90f98fe3..63dd9b7bffb 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/GetMaterialTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/GetMaterialTypesOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.asapi.v3.executor.material;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/GetMaterialsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/GetMaterialsOperationExecutor.java
index a54c99526d4..909e109e87b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/GetMaterialsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/GetMaterialsOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.asapi.v3.executor.material;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ICreateMaterialExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ICreateMaterialExecutor.java
index 68ba83aef81..7bba662a922 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ICreateMaterialExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ICreateMaterialExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.material;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.create.MaterialCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ICreateMaterialTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ICreateMaterialTypeExecutor.java
index a8a8dee4b8d..8a6e178800f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ICreateMaterialTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ICreateMaterialTypeExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.material;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.id.EntityTypePermId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ICreateMaterialTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ICreateMaterialTypesOperationExecutor.java
index af394403e3a..e2df568feba 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ICreateMaterialTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ICreateMaterialTypesOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.material;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.create.ICreateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ICreateMaterialsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ICreateMaterialsOperationExecutor.java
index b226f212e0a..1d3bd0b7b03 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ICreateMaterialsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ICreateMaterialsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.material;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.create.ICreateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IDeleteMaterialExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IDeleteMaterialExecutor.java
index db1bcee7b6e..f0a149e1444 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IDeleteMaterialExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IDeleteMaterialExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.material;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.delete.MaterialDeletionOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IDeleteMaterialTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IDeleteMaterialTypesOperationExecutor.java
index 0fc75557643..a64f5a5869a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IDeleteMaterialTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IDeleteMaterialTypesOperationExecutor.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.asapi.v3.executor.material;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.delete.IDeleteObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IDeleteMaterialsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IDeleteMaterialsOperationExecutor.java
index 5e692a14783..600b552c34b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IDeleteMaterialsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IDeleteMaterialsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.material;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.delete.IDeleteObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IGetMaterialTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IGetMaterialTypesOperationExecutor.java
index 6f9e10b036e..b9fd1d0748b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IGetMaterialTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IGetMaterialTypesOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.material;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IGetMaterialsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IGetMaterialsOperationExecutor.java
index ec0d688cf85..94815a66d20 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IGetMaterialsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IGetMaterialsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.material;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IMapMaterialByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IMapMaterialByIdExecutor.java
index 9e0e32b9a3b..36697b9d48b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IMapMaterialByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IMapMaterialByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.material;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.id.IMaterialId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IMapMaterialTechIdByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IMapMaterialTechIdByIdExecutor.java
index 3ed3d55feed..1881d66016d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IMapMaterialTechIdByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IMapMaterialTechIdByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.material;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.id.IMaterialId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IMaterialAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IMaterialAuthorizationExecutor.java
index 65c0df37737..d9d3134a4d7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IMaterialAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IMaterialAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.material;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.id.IMaterialId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IMaterialTypeAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IMaterialTypeAuthorizationExecutor.java
index 46ce6aefa39..1ced6d5e628 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IMaterialTypeAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IMaterialTypeAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.material;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ISearchMaterialExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ISearchMaterialExecutor.java
index 84263679a2f..b689237024a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ISearchMaterialExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ISearchMaterialExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.material;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.search.MaterialSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ISearchMaterialTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ISearchMaterialTypeExecutor.java
index 364835cec93..e9f8cab925f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ISearchMaterialTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ISearchMaterialTypeExecutor.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.asapi.v3.executor.material;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.search.MaterialTypeSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ISearchMaterialTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ISearchMaterialTypesOperationExecutor.java
index 843cd0d7c9c..f59d90e88a8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ISearchMaterialTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ISearchMaterialTypesOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.material;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ISearchMaterialsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ISearchMaterialsOperationExecutor.java
index b6978a8be5b..6badf6fbc95 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ISearchMaterialsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ISearchMaterialsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.material;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ISetMaterialTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ISetMaterialTypeExecutor.java
index 26d34830922..fd105c7980b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ISetMaterialTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/ISetMaterialTypeExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.material;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.create.MaterialCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IUpdateMaterialExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IUpdateMaterialExecutor.java
index 17504d263d2..730b8db1164 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IUpdateMaterialExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IUpdateMaterialExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.material;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.id.MaterialPermId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IUpdateMaterialPropertyExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IUpdateMaterialPropertyExecutor.java
index 766db4065b1..ebb8f33108a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IUpdateMaterialPropertyExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IUpdateMaterialPropertyExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.material;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.property.IAbstractUpdateEntityPropertyExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IUpdateMaterialTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IUpdateMaterialTypeExecutor.java
index 1a10d495340..6c73ddcf04c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IUpdateMaterialTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IUpdateMaterialTypeExecutor.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.asapi.v3.executor.material;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.id.EntityTypePermId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IUpdateMaterialTypePropertyTypesExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IUpdateMaterialTypePropertyTypesExecutor.java
index 8f390c40fef..e4b0b63eda8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IUpdateMaterialTypePropertyTypesExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IUpdateMaterialTypePropertyTypesExecutor.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.asapi.v3.executor.material;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.update.MaterialTypeUpdate;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IUpdateMaterialTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IUpdateMaterialTypesOperationExecutor.java
index 6fa1d1b7904..e91550487c3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IUpdateMaterialTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IUpdateMaterialTypesOperationExecutor.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.asapi.v3.executor.material;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.update.IUpdateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IUpdateMaterialsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IUpdateMaterialsOperationExecutor.java
index bc7d50faf56..562c26b3002 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IUpdateMaterialsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IUpdateMaterialsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.material;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.update.IUpdateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IVerifyMaterialExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IVerifyMaterialExecutor.java
index fb20e47b304..d0bdd31b233 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IVerifyMaterialExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IVerifyMaterialExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.material;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.id.IMaterialId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IVerifyMaterialsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IVerifyMaterialsOperationExecutor.java
index 30f388d0465..c3d75a6e33b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IVerifyMaterialsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IVerifyMaterialsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.material;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.verify.IVerifyObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/MapMaterialByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/MapMaterialByIdExecutor.java
index 9e118db1f71..a08339a55c5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/MapMaterialByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/MapMaterialByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.material;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/MapMaterialTechIdByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/MapMaterialTechIdByIdExecutor.java
index 90a93d0c55e..d1a07e7682a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/MapMaterialTechIdByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/MapMaterialTechIdByIdExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.executor.material;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/MaterialAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/MaterialAuthorizationExecutor.java
index 923b49160bd..3d076913b32 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/MaterialAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/MaterialAuthorizationExecutor.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.server.asapi.v3.executor.material;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/MaterialTypeAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/MaterialTypeAuthorizationExecutor.java
index 0e4ef34027e..fd292b0960e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/MaterialTypeAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/MaterialTypeAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.material;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/SearchMaterialExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/SearchMaterialExecutor.java
index 2d5607c2892..500890ee28c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/SearchMaterialExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/SearchMaterialExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.material;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/SearchMaterialTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/SearchMaterialTypeExecutor.java
index 111f5d2bf1f..ea7e9fd0ba3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/SearchMaterialTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/SearchMaterialTypeExecutor.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.asapi.v3.executor.material;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/SearchMaterialTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/SearchMaterialTypesOperationExecutor.java
index d85b18abde5..3c87e0e7866 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/SearchMaterialTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/SearchMaterialTypesOperationExecutor.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.server.asapi.v3.executor.material;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/SearchMaterialsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/SearchMaterialsOperationExecutor.java
index c542760293a..c4cab1786e8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/SearchMaterialsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/SearchMaterialsOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.asapi.v3.executor.material;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/SetMaterialTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/SetMaterialTypeExecutor.java
index 04b93bfa63f..c9af04c418b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/SetMaterialTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/SetMaterialTypeExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.material;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialExecutor.java
index d56e612f4f5..328b9cd8d77 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.asapi.v3.executor.material;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialPropertyExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialPropertyExecutor.java
index 595ed8247ae..6841000930b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialPropertyExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialPropertyExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.executor.material;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialTypeExecutor.java
index 123e9e83067..93bb536be52 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialTypeExecutor.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.asapi.v3.executor.material;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialTypePropertyTypesExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialTypePropertyTypesExecutor.java
index e6d32060056..c598dfb11d6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialTypePropertyTypesExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialTypePropertyTypesExecutor.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.asapi.v3.executor.material;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialTypesOperationExecutor.java
index 8d65af2ccbd..979ccc86d89 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialTypesOperationExecutor.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.asapi.v3.executor.material;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialsOperationExecutor.java
index aac77840309..d4bcb7ee6ba 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialsOperationExecutor.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.server.asapi.v3.executor.material;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/VerifyMaterialExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/VerifyMaterialExecutor.java
index e6b35ec07d6..5b949e080c0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/VerifyMaterialExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/VerifyMaterialExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.material;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/VerifyMaterialsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/VerifyMaterialsOperationExecutor.java
index 07a9cc661e3..6e5cc6f8e4b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/VerifyMaterialsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/VerifyMaterialsOperationExecutor.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.server.asapi.v3.executor.material;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/objectkindmodification/IObjectKindModificationAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/objectkindmodification/IObjectKindModificationAuthorizationExecutor.java
index cb621985735..dd9d84e9a84 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/objectkindmodification/IObjectKindModificationAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/objectkindmodification/IObjectKindModificationAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.objectkindmodification;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/objectkindmodification/ISearchObjectKindModificationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/objectkindmodification/ISearchObjectKindModificationExecutor.java
index 8b5e0f02b69..55d83c4e257 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/objectkindmodification/ISearchObjectKindModificationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/objectkindmodification/ISearchObjectKindModificationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.objectkindmodification;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/objectkindmodification/ISearchObjectKindModificationsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/objectkindmodification/ISearchObjectKindModificationsOperationExecutor.java
index e5912093033..36aef8c8754 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/objectkindmodification/ISearchObjectKindModificationsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/objectkindmodification/ISearchObjectKindModificationsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.objectkindmodification;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/objectkindmodification/ObjectKindModificationAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/objectkindmodification/ObjectKindModificationAuthorizationExecutor.java
index cc9a7799122..16baeb13d55 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/objectkindmodification/ObjectKindModificationAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/objectkindmodification/ObjectKindModificationAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.objectkindmodification;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/objectkindmodification/SearchObjectKindModificationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/objectkindmodification/SearchObjectKindModificationExecutor.java
index ef907bc11da..75dcf962c87 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/objectkindmodification/SearchObjectKindModificationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/objectkindmodification/SearchObjectKindModificationExecutor.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.server.asapi.v3.executor.objectkindmodification;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/objectkindmodification/SearchObjectKindModificationsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/objectkindmodification/SearchObjectKindModificationsOperationExecutor.java
index 227751d037d..3ce24099215 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/objectkindmodification/SearchObjectKindModificationsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/objectkindmodification/SearchObjectKindModificationsOperationExecutor.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.server.asapi.v3.executor.objectkindmodification;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/AsynchronousOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/AsynchronousOperationExecutor.java
index 38bece6c0e1..f5d26694125 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/AsynchronousOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/AsynchronousOperationExecutor.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.server.asapi.v3.executor.operation;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/AsynchronousOperationThreadPoolExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/AsynchronousOperationThreadPoolExecutor.java
index 7dbd1244b22..881e9bdffb6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/AsynchronousOperationThreadPoolExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/AsynchronousOperationThreadPoolExecutor.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.server.asapi.v3.executor.operation;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/ExecuteOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/ExecuteOperationExecutor.java
index b6321aadc2f..bbfabe2e42e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/ExecuteOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/ExecuteOperationExecutor.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.server.asapi.v3.executor.operation;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/IAsynchronousOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/IAsynchronousOperationExecutor.java
index 2dbcda23a3a..902df3c2b78 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/IAsynchronousOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/IAsynchronousOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.operation;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/IAsynchronousOperationThreadPoolExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/IAsynchronousOperationThreadPoolExecutor.java
index 2188a6f5f7f..eb15ffe6444 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/IAsynchronousOperationThreadPoolExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/IAsynchronousOperationThreadPoolExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.executor.operation;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/IExecuteOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/IExecuteOperationExecutor.java
index 0f9013af6c8..1ba7833a965 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/IExecuteOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/IExecuteOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.operation;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/IOperationExecutionAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/IOperationExecutionAuthorizationExecutor.java
index 27b46cf2c7b..9648e3b65bb 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/IOperationExecutionAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/IOperationExecutionAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.operation;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.operation.id.IOperationExecutionId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/IOperationExecutionIdFactory.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/IOperationExecutionIdFactory.java
index e425ce20e04..831dfc5176f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/IOperationExecutionIdFactory.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/IOperationExecutionIdFactory.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.ethz.sis.openbis.generic.server.asapi.v3.executor.operation;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.operation.id.OperationExecutionPermId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/IOperationsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/IOperationsExecutor.java
index d5b31e4f4c9..363596ed95e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/IOperationsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/IOperationsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.operation;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/ISynchronousOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/ISynchronousOperationExecutor.java
index 7e32cc8fc27..0f4574d8310 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/ISynchronousOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/ISynchronousOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.operation;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/OperationExecutionAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/OperationExecutionAuthorizationExecutor.java
index ad95a2c921f..00b479fcc1c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/OperationExecutionAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/OperationExecutionAuthorizationExecutor.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.server.asapi.v3.executor.operation;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/OperationListenerLoader.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/OperationListenerLoader.java
index d2bbc799dc8..03536920d3c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/OperationListenerLoader.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/OperationListenerLoader.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.asapi.v3.executor.operation;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/OperationsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/OperationsExecutor.java
index 6e2c2ca5174..87b6cd191b6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/OperationsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/OperationsExecutor.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.server.asapi.v3.executor.operation;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/SynchronousOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/SynchronousOperationExecutor.java
index cf30a25668a..f656a618770 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/SynchronousOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/SynchronousOperationExecutor.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.server.asapi.v3.executor.operation;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/config/IOperationExecutionConfig.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/config/IOperationExecutionConfig.java
index d43fbad4d8d..bbaf662c202 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/config/IOperationExecutionConfig.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/config/IOperationExecutionConfig.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.server.asapi.v3.executor.operation.config;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/config/OperationExecutionConfig.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/config/OperationExecutionConfig.java
index 4fed4ba923a..25bd85be2e1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/config/OperationExecutionConfig.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/config/OperationExecutionConfig.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.server.asapi.v3.executor.operation.config;
 
 import static org.apache.commons.io.FileUtils.ONE_KB;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/delete/DeleteOperationExecutionExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/delete/DeleteOperationExecutionExecutor.java
index 151ea193613..5781e97909e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/delete/DeleteOperationExecutionExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/delete/DeleteOperationExecutionExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.operation.delete;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/delete/DeleteOperationExecutionsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/delete/DeleteOperationExecutionsOperationExecutor.java
index b09e12f5892..5add5512aec 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/delete/DeleteOperationExecutionsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/delete/DeleteOperationExecutionsOperationExecutor.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.server.asapi.v3.executor.operation.delete;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/delete/IDeleteOperationExecutionExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/delete/IDeleteOperationExecutionExecutor.java
index 4a0362b7282..6150edde63c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/delete/IDeleteOperationExecutionExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/delete/IDeleteOperationExecutionExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.operation.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.operation.delete.OperationExecutionDeletionOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/delete/IDeleteOperationExecutionsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/delete/IDeleteOperationExecutionsOperationExecutor.java
index 6137a5d4ff8..68cff292b6e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/delete/IDeleteOperationExecutionsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/delete/IDeleteOperationExecutionsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.operation.delete;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.delete.IDeleteObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/get/GetOperationExecutionsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/get/GetOperationExecutionsOperationExecutor.java
index 611a5d70a63..b581d39cefe 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/get/GetOperationExecutionsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/get/GetOperationExecutionsOperationExecutor.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.server.asapi.v3.executor.operation.get;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/get/IGetOperationExecutionsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/get/IGetOperationExecutionsOperationExecutor.java
index d65a7534aa0..03631d3246f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/get/IGetOperationExecutionsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/get/IGetOperationExecutionsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.operation.get;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/internal/IInternalOperation.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/internal/IInternalOperation.java
index 050dc867208..0909546c921 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/internal/IInternalOperation.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/internal/IInternalOperation.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.ethz.sis.openbis.generic.server.asapi.v3.executor.operation.internal;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/internal/IInternalOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/internal/IInternalOperationExecutor.java
index 88dfb16e432..63774913cbd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/internal/IInternalOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/internal/IInternalOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.operation.internal;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/internal/IInternalOperationResult.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/internal/IInternalOperationResult.java
index 29cb3122736..8acb2b19992 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/internal/IInternalOperationResult.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/internal/IInternalOperationResult.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.ethz.sis.openbis.generic.server.asapi.v3.executor.operation.internal;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperationResult;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/internal/InternalOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/internal/InternalOperationExecutor.java
index b7ea71325e4..85de668307f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/internal/InternalOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/internal/InternalOperationExecutor.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.server.asapi.v3.executor.operation.internal;
 
 import java.util.Collections;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/notification/IOperationExecutionEmailNotifier.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/notification/IOperationExecutionEmailNotifier.java
index e5374c6428f..77f6c67320e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/notification/IOperationExecutionEmailNotifier.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/notification/IOperationExecutionEmailNotifier.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.ethz.sis.openbis.generic.server.asapi.v3.executor.operation.notification;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/notification/IOperationExecutionNotifier.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/notification/IOperationExecutionNotifier.java
index 2c967e3af4d..873d117559e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/notification/IOperationExecutionNotifier.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/notification/IOperationExecutionNotifier.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.ethz.sis.openbis.generic.server.asapi.v3.executor.operation.notification;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/notification/OperationExecutionEmailNotifier.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/notification/OperationExecutionEmailNotifier.java
index b22c6575cf1..8eabc79367b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/notification/OperationExecutionEmailNotifier.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/notification/OperationExecutionEmailNotifier.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.server.asapi.v3.executor.operation.notification;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/notification/OperationExecutionNotifier.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/notification/OperationExecutionNotifier.java
index 3535ea4fcb2..830ac9c13f8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/notification/OperationExecutionNotifier.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/notification/OperationExecutionNotifier.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.server.asapi.v3.executor.operation.notification;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/search/ISearchOperationExecutionsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/search/ISearchOperationExecutionsOperationExecutor.java
index 5ed17f16f1f..e97ca63f5cf 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/search/ISearchOperationExecutionsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/search/ISearchOperationExecutionsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.operation.search;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/search/SearchOperationExecutionsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/search/SearchOperationExecutionsOperationExecutor.java
index e8657f0d15c..246d7a2b971 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/search/SearchOperationExecutionsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/search/SearchOperationExecutionsOperationExecutor.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.server.asapi.v3.executor.operation.search;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/IOperationExecutionDBStore.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/IOperationExecutionDBStore.java
index c47927c94b4..13292ff7809 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/IOperationExecutionDBStore.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/IOperationExecutionDBStore.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.server.asapi.v3.executor.operation.store;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/IOperationExecutionDBStoreDAO.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/IOperationExecutionDBStoreDAO.java
index c169318ca2e..02c79550fd3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/IOperationExecutionDBStoreDAO.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/IOperationExecutionDBStoreDAO.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.server.asapi.v3.executor.operation.store;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/IOperationExecutionFSStore.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/IOperationExecutionFSStore.java
index a429e1bf02f..aa8d6e663e5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/IOperationExecutionFSStore.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/IOperationExecutionFSStore.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.server.asapi.v3.executor.operation.store;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/IOperationExecutionStore.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/IOperationExecutionStore.java
index 07a6d42f91c..146856ca56e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/IOperationExecutionStore.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/IOperationExecutionStore.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.server.asapi.v3.executor.operation.store;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionDBStore.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionDBStore.java
index 9f4fdad5611..cd690016561 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionDBStore.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionDBStore.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.server.asapi.v3.executor.operation.store;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionDBStoreDAO.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionDBStoreDAO.java
index 9e5132ae9f3..b5962d31a79 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionDBStoreDAO.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionDBStoreDAO.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.server.asapi.v3.executor.operation.store;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionDirectory.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionDirectory.java
index c3e51bf014b..2884110912a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionDirectory.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionDirectory.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.server.asapi.v3.executor.operation.store;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionFS.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionFS.java
index 15a74c62a92..a3dc5c6c15e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionFS.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionFS.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.server.asapi.v3.executor.operation.store;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionFSFetchOptions.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionFSFetchOptions.java
index bafdd1daa40..ec3358c41bc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionFSFetchOptions.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionFSFetchOptions.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.server.asapi.v3.executor.operation.store;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionFSStore.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionFSStore.java
index d503f40e13f..719498c02c0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionFSStore.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionFSStore.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.server.asapi.v3.executor.operation.store;
 
 import java.io.BufferedInputStream;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionStore.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionStore.java
index ea8da1c9184..17573f5e670 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionStore.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionStore.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.server.asapi.v3.executor.operation.store;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/update/IUpdateOperationExecutionExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/update/IUpdateOperationExecutionExecutor.java
index 9234f5e59c9..a2373152f54 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/update/IUpdateOperationExecutionExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/update/IUpdateOperationExecutionExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.operation.update;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.operation.id.OperationExecutionPermId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/update/IUpdateOperationExecutionsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/update/IUpdateOperationExecutionsOperationExecutor.java
index 74b91fc985a..6410cec44f2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/update/IUpdateOperationExecutionsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/update/IUpdateOperationExecutionsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.operation.update;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.update.IUpdateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/update/UpdateOperationExecutionExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/update/UpdateOperationExecutionExecutor.java
index 0f7f39d76d2..c70a08f4a64 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/update/UpdateOperationExecutionExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/update/UpdateOperationExecutionExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.server.asapi.v3.executor.operation.update;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/update/UpdateOperationExecutionsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/update/UpdateOperationExecutionsOperationExecutor.java
index 6ce7c947da0..8318d22058c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/update/UpdateOperationExecutionsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/update/UpdateOperationExecutionsOperationExecutor.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.server.asapi.v3.executor.operation.update;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/CreatePersonalAccessTokenExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/CreatePersonalAccessTokenExecutor.java
index 92dc632261c..2cf1b69270a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/CreatePersonalAccessTokenExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/CreatePersonalAccessTokenExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.ethz.sis.openbis.generic.server.asapi.v3.executor.pat;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/CreatePersonalAccessTokensOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/CreatePersonalAccessTokensOperationExecutor.java
index 277a7d13bf9..b171f1061c5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/CreatePersonalAccessTokensOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/CreatePersonalAccessTokensOperationExecutor.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.server.asapi.v3.executor.pat;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/DeletePersonalAccessTokenExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/DeletePersonalAccessTokenExecutor.java
index ad2058e6070..5d3954137d1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/DeletePersonalAccessTokenExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/DeletePersonalAccessTokenExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.pat;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/DeletePersonalAccessTokensOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/DeletePersonalAccessTokensOperationExecutor.java
index 37cccd692c6..4de3f2ce7ce 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/DeletePersonalAccessTokensOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/DeletePersonalAccessTokensOperationExecutor.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.server.asapi.v3.executor.pat;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/GetPersonalAccessTokensOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/GetPersonalAccessTokensOperationExecutor.java
index 24bff1479ff..6a28f2ef590 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/GetPersonalAccessTokensOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/GetPersonalAccessTokensOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.asapi.v3.executor.pat;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/ICreatePersonalAccessTokenExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/ICreatePersonalAccessTokenExecutor.java
index 11c6ac15d15..7d83f13281a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/ICreatePersonalAccessTokenExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/ICreatePersonalAccessTokenExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.pat;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.pat.create.PersonalAccessTokenCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/ICreatePersonalAccessTokensOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/ICreatePersonalAccessTokensOperationExecutor.java
index 0ebfdc8c51e..5cb711c34a2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/ICreatePersonalAccessTokensOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/ICreatePersonalAccessTokensOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.pat;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.create.ICreateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/IDeletePersonalAccessTokenExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/IDeletePersonalAccessTokenExecutor.java
index d6193684eef..034fffb59aa 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/IDeletePersonalAccessTokenExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/IDeletePersonalAccessTokenExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.pat;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.pat.delete.PersonalAccessTokenDeletionOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/IDeletePersonalAccessTokensOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/IDeletePersonalAccessTokensOperationExecutor.java
index 4c596c7ebf7..62981ff70a3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/IDeletePersonalAccessTokensOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/IDeletePersonalAccessTokensOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.pat;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.delete.IDeleteObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/IGetPersonalAccessTokensOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/IGetPersonalAccessTokensOperationExecutor.java
index c9acb67c15d..431a6492b93 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/IGetPersonalAccessTokensOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/IGetPersonalAccessTokensOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.pat;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/IMapPersonalAccessTokenByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/IMapPersonalAccessTokenByIdExecutor.java
index f02c6830265..1efffe646ad 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/IMapPersonalAccessTokenByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/IMapPersonalAccessTokenByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.pat;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.pat.id.IPersonalAccessTokenId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/IPersonalAccessTokenAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/IPersonalAccessTokenAuthorizationExecutor.java
index be815911f3b..0371ac944ff 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/IPersonalAccessTokenAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/IPersonalAccessTokenAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.pat;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.pat.id.IPersonalAccessTokenId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/ISearchPersonalAccessTokenExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/ISearchPersonalAccessTokenExecutor.java
index 17c86cff6a8..159980d47a8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/ISearchPersonalAccessTokenExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/ISearchPersonalAccessTokenExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.pat;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.pat.search.PersonalAccessTokenSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/ISearchPersonalAccessTokensOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/ISearchPersonalAccessTokensOperationExecutor.java
index 0869af56fa4..c306be3fff4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/ISearchPersonalAccessTokensOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/ISearchPersonalAccessTokensOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.pat;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/IUpdatePersonalAccessTokenExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/IUpdatePersonalAccessTokenExecutor.java
index 3791be2e979..ac98a412fb0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/IUpdatePersonalAccessTokenExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/IUpdatePersonalAccessTokenExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.pat;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.pat.id.PersonalAccessTokenPermId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/IUpdatePersonalAccessTokensOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/IUpdatePersonalAccessTokensOperationExecutor.java
index c1c5902be20..a9fd7f20c0e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/IUpdatePersonalAccessTokensOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/IUpdatePersonalAccessTokensOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.pat;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.update.IUpdateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/MapPersonalAccessTokenByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/MapPersonalAccessTokenByIdExecutor.java
index aeec4dcace0..ded6a05632a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/MapPersonalAccessTokenByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/MapPersonalAccessTokenByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.pat;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/PersonalAccessTokenAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/PersonalAccessTokenAuthorizationExecutor.java
index a92bc8a860f..2532741d012 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/PersonalAccessTokenAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/PersonalAccessTokenAuthorizationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.executor.pat;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/SearchPersonalAccessTokenExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/SearchPersonalAccessTokenExecutor.java
index c4f30c95f75..94d1c41695d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/SearchPersonalAccessTokenExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/SearchPersonalAccessTokenExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.pat;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/SearchPersonalAccessTokensOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/SearchPersonalAccessTokensOperationExecutor.java
index 54fc4b5308c..5e033daa2e4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/SearchPersonalAccessTokensOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/SearchPersonalAccessTokensOperationExecutor.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.server.asapi.v3.executor.pat;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/UpdatePersonalAccessTokenExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/UpdatePersonalAccessTokenExecutor.java
index dfa37598c44..2e5be28fbab 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/UpdatePersonalAccessTokenExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/UpdatePersonalAccessTokenExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.ethz.sis.openbis.generic.server.asapi.v3.executor.pat;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/UpdatePersonalAccessTokensOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/UpdatePersonalAccessTokensOperationExecutor.java
index 80199378a7a..cacd4eb7ae5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/UpdatePersonalAccessTokensOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/pat/UpdatePersonalAccessTokensOperationExecutor.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.server.asapi.v3.executor.pat;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/CreatePersonExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/CreatePersonExecutor.java
index 95a3d56158c..bb443f97d41 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/CreatePersonExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/CreatePersonExecutor.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.asapi.v3.executor.person;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/CreatePersonsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/CreatePersonsOperationExecutor.java
index 1eda03583de..a9f68f7ddc6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/CreatePersonsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/CreatePersonsOperationExecutor.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.asapi.v3.executor.person;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/DeletePersonExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/DeletePersonExecutor.java
index b8e4d4f9ae0..bb57acf4ed4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/DeletePersonExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/DeletePersonExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.person;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/DeletePersonsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/DeletePersonsOperationExecutor.java
index fe52b51dbf3..9ff93c4fdd1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/DeletePersonsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/DeletePersonsOperationExecutor.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.server.asapi.v3.executor.person;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/GetPersonsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/GetPersonsOperationExecutor.java
index 8da2777999d..2fd594950d5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/GetPersonsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/GetPersonsOperationExecutor.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.asapi.v3.executor.person;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/ICreatePersonExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/ICreatePersonExecutor.java
index a1dbae519fb..a1bcf2aa474 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/ICreatePersonExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/ICreatePersonExecutor.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.asapi.v3.executor.person;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.create.PersonCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/ICreatePersonsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/ICreatePersonsOperationExecutor.java
index cbafac99f0f..33ca93bad64 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/ICreatePersonsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/ICreatePersonsOperationExecutor.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.asapi.v3.executor.person;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.create.ICreateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IDeletePersonExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IDeletePersonExecutor.java
index 196f59bfbd2..2ffe1e5d4c3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IDeletePersonExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IDeletePersonExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.person;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.delete.PersonDeletionOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IDeletePersonsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IDeletePersonsOperationExecutor.java
index 337bfe2336d..bdf705790de 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IDeletePersonsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IDeletePersonsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.person;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.delete.IDeleteObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IGetPersonsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IGetPersonsOperationExecutor.java
index 6048f3f1a34..cae5f541cec 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IGetPersonsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IGetPersonsOperationExecutor.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.asapi.v3.executor.person;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IMapPersonByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IMapPersonByIdExecutor.java
index 8f692a6359a..da59dbea688 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IMapPersonByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IMapPersonByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.person;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.id.IPersonId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IMapPersonIdByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IMapPersonIdByIdExecutor.java
index 9a39390224f..4671957d78d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IMapPersonIdByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IMapPersonIdByIdExecutor.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.asapi.v3.executor.person;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.id.IPersonId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IPersonAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IPersonAuthorizationExecutor.java
index 2a63e2bf2d6..c9e52deab84 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IPersonAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IPersonAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.person;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/ISearchPersonExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/ISearchPersonExecutor.java
index 03ce6075783..af329461dd4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/ISearchPersonExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/ISearchPersonExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.person;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.search.PersonSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/ISearchPersonsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/ISearchPersonsOperationExecutor.java
index 0adb7959eef..c4db4b47177 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/ISearchPersonsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/ISearchPersonsOperationExecutor.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.asapi.v3.executor.person;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/ISetPersonSpaceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/ISetPersonSpaceExecutor.java
index 27ceecc0d55..0e633e83614 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/ISetPersonSpaceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/ISetPersonSpaceExecutor.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.asapi.v3.executor.person;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.create.PersonCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IUpdateHomeSpaceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IUpdateHomeSpaceExecutor.java
index 31ab4f329f1..29ebbcc324a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IUpdateHomeSpaceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IUpdateHomeSpaceExecutor.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.asapi.v3.executor.person;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.update.PersonUpdate;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IUpdatePersonExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IUpdatePersonExecutor.java
index add8c55e0a1..d09b114d490 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IUpdatePersonExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IUpdatePersonExecutor.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.asapi.v3.executor.person;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.id.PersonPermId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IUpdatePersonsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IUpdatePersonsOperationExecutor.java
index 4c236513ed8..0dde937c994 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IUpdatePersonsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IUpdatePersonsOperationExecutor.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.asapi.v3.executor.person;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.update.IUpdateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IUpdateWebAppSettingsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IUpdateWebAppSettingsExecutor.java
index b77cb60e229..d78c0fa3062 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IUpdateWebAppSettingsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/IUpdateWebAppSettingsExecutor.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.asapi.v3.executor.person;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.update.PersonUpdate;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/MapPersonByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/MapPersonByIdExecutor.java
index cf455356399..8bcfe388155 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/MapPersonByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/MapPersonByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.person;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/MapPersonIdByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/MapPersonIdByIdExecutor.java
index e9d8f8074e5..5489df4dd7f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/MapPersonIdByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/MapPersonIdByIdExecutor.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.asapi.v3.executor.person;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/PersonAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/PersonAuthorizationExecutor.java
index 3632b3c7718..c0dc8f74f59 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/PersonAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/PersonAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.person;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/SearchPersonExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/SearchPersonExecutor.java
index 27fc2608504..563500a07c1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/SearchPersonExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/SearchPersonExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.executor.person;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/SearchPersonsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/SearchPersonsOperationExecutor.java
index 20a32a0b524..b7808426a1a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/SearchPersonsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/SearchPersonsOperationExecutor.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.asapi.v3.executor.person;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.search.planner.ILocalSearchManager;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/SetPersonSpaceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/SetPersonSpaceExecutor.java
index ebafca8ce92..d474a57ebb1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/SetPersonSpaceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/SetPersonSpaceExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 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.ethz.sis.openbis.generic.server.asapi.v3.executor.person;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/UpdateHomeSpaceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/UpdateHomeSpaceExecutor.java
index b8e441912a6..afcd6fb2375 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/UpdateHomeSpaceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/UpdateHomeSpaceExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 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.ethz.sis.openbis.generic.server.asapi.v3.executor.person;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/UpdatePersonExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/UpdatePersonExecutor.java
index a2b8adca274..e0c6bfe0e4a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/UpdatePersonExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/UpdatePersonExecutor.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.asapi.v3.executor.person;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/UpdatePersonsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/UpdatePersonsOperationExecutor.java
index 753f3841df8..c095aa8da69 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/UpdatePersonsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/UpdatePersonsOperationExecutor.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.asapi.v3.executor.person;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/UpdateWebAppSettingsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/UpdateWebAppSettingsExecutor.java
index 74f30212e4a..0b00a9be9e5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/UpdateWebAppSettingsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/person/UpdateWebAppSettingsExecutor.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.server.asapi.v3.executor.person;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/CreatePluginExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/CreatePluginExecutor.java
index 1ae6f1e748b..75187beba62 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/CreatePluginExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/CreatePluginExecutor.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.asapi.v3.executor.plugin;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/CreatePluginsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/CreatePluginsOperationExecutor.java
index 21abc607ddf..b22d2340e0e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/CreatePluginsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/CreatePluginsOperationExecutor.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.server.asapi.v3.executor.plugin;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/DeletePluginExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/DeletePluginExecutor.java
index 082153b5af3..139223468d1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/DeletePluginExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/DeletePluginExecutor.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.asapi.v3.executor.plugin;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/DeletePluginsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/DeletePluginsOperationExecutor.java
index 6b704f1a17a..e2332118afb 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/DeletePluginsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/DeletePluginsOperationExecutor.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.server.asapi.v3.executor.plugin;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/EvaluatePluginExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/EvaluatePluginExecutor.java
index b81ed6bb783..9a05e09776d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/EvaluatePluginExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/EvaluatePluginExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 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.asapi.v3.executor.plugin;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/EvaluatePluginOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/EvaluatePluginOperationExecutor.java
index 69e7d5b53bc..599297447bd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/EvaluatePluginOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/EvaluatePluginOperationExecutor.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.asapi.v3.executor.plugin;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/GetPluginsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/GetPluginsOperationExecutor.java
index 0fc2c29b482..2966b358f33 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/GetPluginsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/GetPluginsOperationExecutor.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.server.asapi.v3.executor.plugin;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/ICreatePluginExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/ICreatePluginExecutor.java
index 1a5219ef786..6db4ad7317f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/ICreatePluginExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/ICreatePluginExecutor.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.asapi.v3.executor.plugin;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.plugin.create.PluginCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/ICreatePluginsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/ICreatePluginsOperationExecutor.java
index a531971d93e..41460c1e655 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/ICreatePluginsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/ICreatePluginsOperationExecutor.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.asapi.v3.executor.plugin;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IDeletePluginExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IDeletePluginExecutor.java
index 86d07a7907d..3cc40bd7ecd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IDeletePluginExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IDeletePluginExecutor.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.asapi.v3.executor.plugin;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.plugin.delete.PluginDeletionOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IDeletePluginsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IDeletePluginsOperationExecutor.java
index 5623b032493..98d9cf98e04 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IDeletePluginsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IDeletePluginsOperationExecutor.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.asapi.v3.executor.plugin;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.delete.IDeleteObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IEvaluatePluginExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IEvaluatePluginExecutor.java
index 6d2101714c7..d4a05258771 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IEvaluatePluginExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IEvaluatePluginExecutor.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.asapi.v3.executor.plugin;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.plugin.evaluate.PluginEvaluationOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IEvaluatePluginOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IEvaluatePluginOperationExecutor.java
index 3f2ebc69d08..457bd055ce7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IEvaluatePluginOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IEvaluatePluginOperationExecutor.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.asapi.v3.executor.plugin;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IGetPluginsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IGetPluginsOperationExecutor.java
index 2fcd2929d1d..2d25ae711ad 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IGetPluginsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IGetPluginsOperationExecutor.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.asapi.v3.executor.plugin;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IMapPluginByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IMapPluginByIdExecutor.java
index 943a55b161e..e39f6b15d43 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IMapPluginByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IMapPluginByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.plugin;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.plugin.id.IPluginId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IPluginAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IPluginAuthorizationExecutor.java
index e5c1a7a5843..0fbf76861bb 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IPluginAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IPluginAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.plugin;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.plugin.id.IPluginId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/ISearchPluginExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/ISearchPluginExecutor.java
index 271345c3a4c..11cb42763e4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/ISearchPluginExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/ISearchPluginExecutor.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.asapi.v3.executor.plugin;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.plugin.search.PluginSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/ISearchPluginsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/ISearchPluginsOperationExecutor.java
index e9c4154b9f0..bb8647a35f0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/ISearchPluginsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/ISearchPluginsOperationExecutor.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.asapi.v3.executor.plugin;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IUpdatePluginExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IUpdatePluginExecutor.java
index 2127021dafe..5d8a7e6c4e1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IUpdatePluginExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IUpdatePluginExecutor.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.asapi.v3.executor.plugin;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.plugin.id.PluginPermId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IUpdatePluginsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IUpdatePluginsOperationExecutor.java
index 926cc148f76..3b0cc386cfe 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IUpdatePluginsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/IUpdatePluginsOperationExecutor.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.asapi.v3.executor.plugin;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.update.IUpdateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/MapPluginByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/MapPluginByIdExecutor.java
index b7b12eb95e2..6c14d86048d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/MapPluginByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/MapPluginByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.plugin;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/PluginAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/PluginAuthorizationExecutor.java
index d16db2f04f2..b9e9772e6a9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/PluginAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/PluginAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.plugin;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/SearchPluginExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/SearchPluginExecutor.java
index 8e6777c08cd..b9a565144fc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/SearchPluginExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/SearchPluginExecutor.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.asapi.v3.executor.plugin;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/SearchPluginsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/SearchPluginsOperationExecutor.java
index 4b069f77e0f..aeb8bbda28e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/SearchPluginsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/SearchPluginsOperationExecutor.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.server.asapi.v3.executor.plugin;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.search.planner.ILocalSearchManager;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/UpdatePluginExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/UpdatePluginExecutor.java
index be4c18d37bc..39e97308e8d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/UpdatePluginExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/UpdatePluginExecutor.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.asapi.v3.executor.plugin;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/UpdatePluginsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/UpdatePluginsOperationExecutor.java
index 4d1a7bbaf3e..d6eddbfc892 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/UpdatePluginsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/plugin/UpdatePluginsOperationExecutor.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.server.asapi.v3.executor.plugin;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/CreateProjectExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/CreateProjectExecutor.java
index c66a0665403..6cc88a08f44 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/CreateProjectExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/CreateProjectExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.asapi.v3.executor.project;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/CreateProjectsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/CreateProjectsOperationExecutor.java
index 537f8d0000a..dcb4a639033 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/CreateProjectsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/CreateProjectsOperationExecutor.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.server.asapi.v3.executor.project;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/DeleteProjectExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/DeleteProjectExecutor.java
index 7eb041e4bdd..bc788dd5623 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/DeleteProjectExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/DeleteProjectExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.project;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/DeleteProjectsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/DeleteProjectsOperationExecutor.java
index 0294e01c081..faeca3c7899 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/DeleteProjectsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/DeleteProjectsOperationExecutor.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.server.asapi.v3.executor.project;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/GetProjectsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/GetProjectsOperationExecutor.java
index aebbc73726e..5c424582c66 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/GetProjectsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/GetProjectsOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.executor.project;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ICreateProjectExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ICreateProjectExecutor.java
index 64685221a7d..44daa641a51 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ICreateProjectExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ICreateProjectExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.project;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.project.create.ProjectCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ICreateProjectsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ICreateProjectsOperationExecutor.java
index 5c1ea053dca..9766717fcef 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ICreateProjectsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ICreateProjectsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.project;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.create.ICreateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IDeleteProjectExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IDeleteProjectExecutor.java
index df39a39a87d..91b2a48697c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IDeleteProjectExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IDeleteProjectExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.project;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.project.delete.ProjectDeletionOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IDeleteProjectsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IDeleteProjectsOperationExecutor.java
index 8665a9a70c1..5d157a80b93 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IDeleteProjectsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IDeleteProjectsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.project;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.delete.IDeleteObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IGetProjectsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IGetProjectsOperationExecutor.java
index 5ef194da426..a0b4bcd495f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IGetProjectsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IGetProjectsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.project;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IMapProjectByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IMapProjectByIdExecutor.java
index 8f33225f97c..54c44fcdfbd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IMapProjectByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IMapProjectByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.project;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.project.id.IProjectId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IMapProjectTechIdByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IMapProjectTechIdByIdExecutor.java
index 402c22e5c1f..cf4ff1bfc62 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IMapProjectTechIdByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IMapProjectTechIdByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.project;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.project.id.IProjectId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IProjectAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IProjectAuthorizationExecutor.java
index 3ab8c3d86bc..9faa75ec199 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IProjectAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IProjectAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.project;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.project.id.IProjectId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ISearchProjectExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ISearchProjectExecutor.java
index 6716521e4d3..b82818ee278 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ISearchProjectExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ISearchProjectExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.project;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.project.search.ProjectSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ISearchProjectsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ISearchProjectsOperationExecutor.java
index 185bbaee5e5..93a4b67f2b2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ISearchProjectsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ISearchProjectsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.project;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ISetProjectLeaderExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ISetProjectLeaderExecutor.java
index 552d05d403c..a2b996b8330 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ISetProjectLeaderExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ISetProjectLeaderExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.project;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.project.create.ProjectCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ISetProjectSpaceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ISetProjectSpaceExecutor.java
index 000c89286f6..d05f60c996c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ISetProjectSpaceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ISetProjectSpaceExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.project;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.project.create.ProjectCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IUpdateProjectAttachmentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IUpdateProjectAttachmentExecutor.java
index c89a1b79aa3..bc1753adcf5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IUpdateProjectAttachmentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IUpdateProjectAttachmentExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.project;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.attachment.IAbstractUpdateAttachmentForEntityExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IUpdateProjectExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IUpdateProjectExecutor.java
index a1a9cc0e01f..88b8afc9d25 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IUpdateProjectExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IUpdateProjectExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.project;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.project.id.ProjectPermId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IUpdateProjectSpaceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IUpdateProjectSpaceExecutor.java
index dfac7b3d0f2..5bd8387a49a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IUpdateProjectSpaceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IUpdateProjectSpaceExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.project;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.project.update.ProjectUpdate;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IUpdateProjectsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IUpdateProjectsOperationExecutor.java
index 6693dd7b67a..c2de732e0f6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IUpdateProjectsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IUpdateProjectsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.project;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.update.IUpdateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/MapProjectByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/MapProjectByIdExecutor.java
index 068b72dd00c..ad156a00916 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/MapProjectByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/MapProjectByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.project;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/MapProjectTechIdByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/MapProjectTechIdByIdExecutor.java
index ce7547bddfd..d3d61866d48 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/MapProjectTechIdByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/MapProjectTechIdByIdExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.executor.project;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ProjectAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ProjectAuthorizationExecutor.java
index 69bd83678d7..deffa2e1a1a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ProjectAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ProjectAuthorizationExecutor.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.server.asapi.v3.executor.project;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/SearchProjectExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/SearchProjectExecutor.java
index 0dceb979804..0c33edb0404 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/SearchProjectExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/SearchProjectExecutor.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.asapi.v3.executor.project;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/SearchProjectsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/SearchProjectsOperationExecutor.java
index cde3edd7441..bf09ba84b71 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/SearchProjectsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/SearchProjectsOperationExecutor.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.server.asapi.v3.executor.project;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/SetProjectLeaderExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/SetProjectLeaderExecutor.java
index eeed29e5db8..a92e9323d82 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/SetProjectLeaderExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/SetProjectLeaderExecutor.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.asapi.v3.executor.project;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/SetProjectSpaceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/SetProjectSpaceExecutor.java
index 7fd3ec125e0..51d428c24a1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/SetProjectSpaceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/SetProjectSpaceExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.executor.project;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/UpdateProjectAttachmentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/UpdateProjectAttachmentExecutor.java
index fa76b6f018a..cb0fc7d1461 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/UpdateProjectAttachmentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/UpdateProjectAttachmentExecutor.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.asapi.v3.executor.project;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/UpdateProjectExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/UpdateProjectExecutor.java
index 78730ecab42..9d39eec3c9e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/UpdateProjectExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/UpdateProjectExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.asapi.v3.executor.project;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/UpdateProjectSpaceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/UpdateProjectSpaceExecutor.java
index be2a03a8c86..5b261666391 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/UpdateProjectSpaceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/UpdateProjectSpaceExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.project;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/UpdateProjectsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/UpdateProjectsOperationExecutor.java
index f9ad7c89d2d..6d6e806d99a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/UpdateProjectsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/UpdateProjectsOperationExecutor.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.server.asapi.v3.executor.project;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/CreatePropertyTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/CreatePropertyTypeExecutor.java
index 65869f8e434..7ea063e3b98 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/CreatePropertyTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/CreatePropertyTypeExecutor.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.asapi.v3.executor.property;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/CreatePropertyTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/CreatePropertyTypesOperationExecutor.java
index 1b6681fd2ea..9a9e49e42b1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/CreatePropertyTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/CreatePropertyTypesOperationExecutor.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.server.asapi.v3.executor.property;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/DeletePropertyTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/DeletePropertyTypeExecutor.java
index d8ba45a9e6e..645bb49c8e5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/DeletePropertyTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/DeletePropertyTypeExecutor.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.asapi.v3.executor.property;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/DeletePropertyTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/DeletePropertyTypesOperationExecutor.java
index fd790ce48b5..bb3716e8f2a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/DeletePropertyTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/DeletePropertyTypesOperationExecutor.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.server.asapi.v3.executor.property;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/GetPropertyTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/GetPropertyTypesOperationExecutor.java
index 97097aa797a..f208f4d7569 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/GetPropertyTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/GetPropertyTypesOperationExecutor.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.server.asapi.v3.executor.property;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IAbstractUpdateEntityPropertyExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IAbstractUpdateEntityPropertyExecutor.java
index 72d318abbc2..f09301141d5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IAbstractUpdateEntityPropertyExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IAbstractUpdateEntityPropertyExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IPropertiesHolder;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ICreatePropertyTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ICreatePropertyTypeExecutor.java
index 66c58258b57..8344b20b6b8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ICreatePropertyTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ICreatePropertyTypeExecutor.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.asapi.v3.executor.property;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.create.PropertyTypeCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ICreatePropertyTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ICreatePropertyTypesOperationExecutor.java
index f727c4e3f26..260278c92a9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ICreatePropertyTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ICreatePropertyTypesOperationExecutor.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.asapi.v3.executor.property;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IDeletePropertyTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IDeletePropertyTypeExecutor.java
index 262953cc289..a1c5c46cce8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IDeletePropertyTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IDeletePropertyTypeExecutor.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.asapi.v3.executor.property;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.delete.PropertyTypeDeletionOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IDeletePropertyTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IDeletePropertyTypesOperationExecutor.java
index 736a4b3b7de..c12eca3800f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IDeletePropertyTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IDeletePropertyTypesOperationExecutor.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.asapi.v3.executor.property;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.delete.IDeleteObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IGetPropertyTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IGetPropertyTypesOperationExecutor.java
index b0390fbd5a4..8af6ffdd201 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IGetPropertyTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IGetPropertyTypesOperationExecutor.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.asapi.v3.executor.property;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IMapPropertyAssignmentByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IMapPropertyAssignmentByIdExecutor.java
index c00ceeae5d4..1ebfdce338a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IMapPropertyAssignmentByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IMapPropertyAssignmentByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.IPropertyAssignmentId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IMapPropertyTypeByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IMapPropertyTypeByIdExecutor.java
index 96df2664bcd..087b3544343 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IMapPropertyTypeByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IMapPropertyTypeByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.IPropertyTypeId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IPropertiesConverter.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IPropertiesConverter.java
index de31894d9b5..b5b75100fef 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IPropertiesConverter.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IPropertiesConverter.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.asapi.v3.executor.property;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.DataType;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IPropertyTypeAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IPropertyTypeAuthorizationExecutor.java
index a4f968e4108..c31d48be7eb 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IPropertyTypeAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IPropertyTypeAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.IPropertyTypeId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ISearchPropertyAssignmentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ISearchPropertyAssignmentExecutor.java
index 6b3ad59bee2..a923a3a2ca8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ISearchPropertyAssignmentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ISearchPropertyAssignmentExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.search.PropertyAssignmentSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ISearchPropertyAssignmentsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ISearchPropertyAssignmentsOperationExecutor.java
index 63dbef52768..c5d027ad4c5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ISearchPropertyAssignmentsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ISearchPropertyAssignmentsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ISearchPropertyTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ISearchPropertyTypeExecutor.java
index 14f135ea176..2f80a1c0781 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ISearchPropertyTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ISearchPropertyTypeExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.search.PropertyTypeSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ISearchPropertyTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ISearchPropertyTypesOperationExecutor.java
index 768624e8de2..0aaac2eb580 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ISearchPropertyTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ISearchPropertyTypesOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ISetPropertyTypeMaterialTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ISetPropertyTypeMaterialTypeExecutor.java
index 0a690317ad8..940c7a2e412 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ISetPropertyTypeMaterialTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ISetPropertyTypeMaterialTypeExecutor.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.asapi.v3.executor.property;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.create.PropertyTypeCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ISetPropertyTypeSampleTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ISetPropertyTypeSampleTypeExecutor.java
index cb79f2f5def..b718f97dac4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ISetPropertyTypeSampleTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ISetPropertyTypeSampleTypeExecutor.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.asapi.v3.executor.property;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.create.PropertyTypeCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ISetPropertyTypeVocabularyExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ISetPropertyTypeVocabularyExecutor.java
index 31d5dd6b151..53f422fefe9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ISetPropertyTypeVocabularyExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/ISetPropertyTypeVocabularyExecutor.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.asapi.v3.executor.property;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.create.PropertyTypeCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IUpdateEntityPropertyExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IUpdateEntityPropertyExecutor.java
index 4e65dd132ac..7149d88f8a4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IUpdateEntityPropertyExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IUpdateEntityPropertyExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IUpdatePropertyTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IUpdatePropertyTypeExecutor.java
index b99b9747f6c..02acb912910 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IUpdatePropertyTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IUpdatePropertyTypeExecutor.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.asapi.v3.executor.property;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id.PropertyTypePermId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IUpdatePropertyTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IUpdatePropertyTypesOperationExecutor.java
index 1d9a496a709..466d00aeac8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IUpdatePropertyTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IUpdatePropertyTypesOperationExecutor.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.asapi.v3.executor.property;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.update.IUpdateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IVerifyEntityPropertyExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IVerifyEntityPropertyExecutor.java
index 9848572024b..abe12f8aaae 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IVerifyEntityPropertyExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/IVerifyEntityPropertyExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/MapPropertyAssignmentByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/MapPropertyAssignmentByIdExecutor.java
index 0cb2ac907c4..a373c9c1772 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/MapPropertyAssignmentByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/MapPropertyAssignmentByIdExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.property;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/MapPropertyTypeByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/MapPropertyTypeByIdExecutor.java
index a26a50b0e5c..ab50db5953f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/MapPropertyTypeByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/MapPropertyTypeByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/PropertiesConverter.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/PropertiesConverter.java
index 89c6cd61455..f8f897578c2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/PropertiesConverter.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/PropertiesConverter.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.asapi.v3.executor.property;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/PropertyTypeAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/PropertyTypeAuthorizationExecutor.java
index 862f6573b4c..727830e45e9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/PropertyTypeAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/PropertyTypeAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/SearchPropertyAssignmentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/SearchPropertyAssignmentExecutor.java
index c1be60d4ca8..fb215aa2fc5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/SearchPropertyAssignmentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/SearchPropertyAssignmentExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/SearchPropertyAssignmentsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/SearchPropertyAssignmentsOperationExecutor.java
index a3a1f508f82..9d49acd51a8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/SearchPropertyAssignmentsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/SearchPropertyAssignmentsOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
 
 import java.util.*;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/SearchPropertyTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/SearchPropertyTypeExecutor.java
index e9270c6c48e..46ffa717f6f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/SearchPropertyTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/SearchPropertyTypeExecutor.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.asapi.v3.executor.property;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/SearchPropertyTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/SearchPropertyTypesOperationExecutor.java
index 58022c4f5ba..5cab53069ef 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/SearchPropertyTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/SearchPropertyTypesOperationExecutor.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.server.asapi.v3.executor.property;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.search.planner.ILocalSearchManager;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/SetPropertyTypeMaterialTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/SetPropertyTypeMaterialTypeExecutor.java
index 491180be97f..70d842628aa 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/SetPropertyTypeMaterialTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/SetPropertyTypeMaterialTypeExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 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.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/SetPropertyTypeSampleTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/SetPropertyTypeSampleTypeExecutor.java
index 6256722aeb2..4ce6e5e7001 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/SetPropertyTypeSampleTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/SetPropertyTypeSampleTypeExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/SetPropertyTypeVocabularyExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/SetPropertyTypeVocabularyExecutor.java
index bcca76b136d..e97c9184580 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/SetPropertyTypeVocabularyExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/SetPropertyTypeVocabularyExecutor.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.asapi.v3.executor.property;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/UpdateEntityPropertyExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/UpdateEntityPropertyExecutor.java
index 5fde6705980..021eb080107 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/UpdateEntityPropertyExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/UpdateEntityPropertyExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/UpdatePropertyTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/UpdatePropertyTypeExecutor.java
index dedd6543932..9af8029a272 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/UpdatePropertyTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/UpdatePropertyTypeExecutor.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.asapi.v3.executor.property;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/UpdatePropertyTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/UpdatePropertyTypesOperationExecutor.java
index 6b7b5c579a9..1b25ca70fe9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/UpdatePropertyTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/UpdatePropertyTypesOperationExecutor.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.server.asapi.v3.executor.property;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/VerifyEntityPropertyExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/VerifyEntityPropertyExecutor.java
index 89aabf3b874..5bd96c7a862 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/VerifyEntityPropertyExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/VerifyEntityPropertyExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/AbstractExecuteExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/AbstractExecuteExecutor.java
index b3e50e589cf..1c0a9bae9a3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/AbstractExecuteExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/AbstractExecuteExecutor.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.asapi.v3.executor.query;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/CreateQueriesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/CreateQueriesOperationExecutor.java
index 2c0adb71b87..ec9f20bded1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/CreateQueriesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/CreateQueriesOperationExecutor.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.server.asapi.v3.executor.query;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/CreateQueryExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/CreateQueryExecutor.java
index e3abd01b44b..c8b6a317d5b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/CreateQueryExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/CreateQueryExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.asapi.v3.executor.query;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/DeleteQueriesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/DeleteQueriesOperationExecutor.java
index ff27e8e4318..953cf9d3367 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/DeleteQueriesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/DeleteQueriesOperationExecutor.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.server.asapi.v3.executor.query;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/DeleteQueryExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/DeleteQueryExecutor.java
index f804b99d328..745fd9ec5a4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/DeleteQueryExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/DeleteQueryExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.query;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ExecuteQueryExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ExecuteQueryExecutor.java
index 87bc4df6c48..8b7992489bd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ExecuteQueryExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ExecuteQueryExecutor.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.asapi.v3.executor.query;
 
 import org.apache.commons.text.StringEscapeUtils;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ExecuteQueryOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ExecuteQueryOperationExecutor.java
index 9c3bffd4375..5c58b9a7d9e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ExecuteQueryOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ExecuteQueryOperationExecutor.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.asapi.v3.executor.query;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ExecuteSqlExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ExecuteSqlExecutor.java
index 371433db71d..e276c30de19 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ExecuteSqlExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ExecuteSqlExecutor.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.asapi.v3.executor.query;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ExecuteSqlOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ExecuteSqlOperationExecutor.java
index a32050753cf..9cc030b964a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ExecuteSqlOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ExecuteSqlOperationExecutor.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.asapi.v3.executor.query;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/GetQueriesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/GetQueriesOperationExecutor.java
index e7751137882..9544f6212f7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/GetQueriesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/GetQueriesOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.asapi.v3.executor.query;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/GetQueryDatabasesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/GetQueryDatabasesOperationExecutor.java
index 6407ac03875..8a5d9cd5fcf 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/GetQueryDatabasesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/GetQueryDatabasesOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, CISD
+ * 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.asapi.v3.executor.query;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ICreateQueriesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ICreateQueriesOperationExecutor.java
index 3e4340b0f44..f6f7c955fa4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ICreateQueriesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ICreateQueriesOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.query;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.create.ICreateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ICreateQueryExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ICreateQueryExecutor.java
index a06e1731caa..72c52858b5d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ICreateQueryExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ICreateQueryExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.query;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.query.create.QueryCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IDeleteQueriesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IDeleteQueriesOperationExecutor.java
index 42669dfe472..12797964822 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IDeleteQueriesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IDeleteQueriesOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.query;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.delete.IDeleteObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IDeleteQueryExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IDeleteQueryExecutor.java
index 7831e550fe7..e803c8ed528 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IDeleteQueryExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IDeleteQueryExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.query;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.query.delete.QueryDeletionOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IExecuteQueryExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IExecuteQueryExecutor.java
index 34f4a939ab8..4141e0b0923 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IExecuteQueryExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IExecuteQueryExecutor.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.asapi.v3.executor.query;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.TableModel;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IExecuteQueryOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IExecuteQueryOperationExecutor.java
index 84217e619c2..eefc149c454 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IExecuteQueryOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IExecuteQueryOperationExecutor.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.asapi.v3.executor.query;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IExecuteSqlExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IExecuteSqlExecutor.java
index a9fad85647c..313db0fdb6a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IExecuteSqlExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IExecuteSqlExecutor.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.asapi.v3.executor.query;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.TableModel;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IExecuteSqlOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IExecuteSqlOperationExecutor.java
index 4e2e08b338f..b4579f52c91 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IExecuteSqlOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IExecuteSqlOperationExecutor.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.asapi.v3.executor.query;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IGetQueriesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IGetQueriesOperationExecutor.java
index 0688db577ac..4c006bcdc92 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IGetQueriesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IGetQueriesOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.query;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IGetQueryDatabasesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IGetQueryDatabasesOperationExecutor.java
index fd82cb5629a..1965edcd412 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IGetQueryDatabasesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IGetQueryDatabasesOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.query;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IMapQueryByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IMapQueryByIdExecutor.java
index ae2a6c180c1..6257e2f4da0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IMapQueryByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IMapQueryByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.query;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.query.id.IQueryId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IMapQueryDatabaseByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IMapQueryDatabaseByIdExecutor.java
index dcee186af5b..c0aef70774a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IMapQueryDatabaseByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IMapQueryDatabaseByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.query;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.query.id.IQueryDatabaseId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IQueryAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IQueryAuthorizationExecutor.java
index cdc67c7a307..1ca0d11aab3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IQueryAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IQueryAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.query;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.query.id.IQueryId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IQueryDatabaseAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IQueryDatabaseAuthorizationExecutor.java
index c318e6cae9b..cfdacd904b5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IQueryDatabaseAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IQueryDatabaseAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.query;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ISearchQueriesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ISearchQueriesOperationExecutor.java
index 1e441b27791..e12a11030f5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ISearchQueriesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ISearchQueriesOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.query;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ISearchQueryDatabaseExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ISearchQueryDatabaseExecutor.java
index 43b0fa04fc2..523c1e0642f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ISearchQueryDatabaseExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ISearchQueryDatabaseExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.query;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.query.search.QueryDatabaseSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ISearchQueryDatabasesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ISearchQueryDatabasesOperationExecutor.java
index f6eaed8ccb2..1efb7df842e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ISearchQueryDatabasesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ISearchQueryDatabasesOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.query;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ISearchQueryExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ISearchQueryExecutor.java
index 28deda75ac6..22132865c6e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ISearchQueryExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ISearchQueryExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.query;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.query.search.QuerySearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ISetQueryDatabaseExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ISetQueryDatabaseExecutor.java
index 7ed9b98cd03..3ccfe37b48e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ISetQueryDatabaseExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/ISetQueryDatabaseExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.query;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.query.create.QueryCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IUpdateQueriesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IUpdateQueriesOperationExecutor.java
index bdea5e36e12..11f4b8bd5a1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IUpdateQueriesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IUpdateQueriesOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.query;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.update.IUpdateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IUpdateQueryDatabaseExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IUpdateQueryDatabaseExecutor.java
index 354809662ab..0752feed695 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IUpdateQueryDatabaseExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IUpdateQueryDatabaseExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.query;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.query.update.QueryUpdate;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IUpdateQueryExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IUpdateQueryExecutor.java
index 823cb4c4d70..32dee74dc78 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IUpdateQueryExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/IUpdateQueryExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.query;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.query.id.QueryTechId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/MapQueryByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/MapQueryByIdExecutor.java
index e477241debe..3eb756629b6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/MapQueryByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/MapQueryByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.query;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/MapQueryDatabaseByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/MapQueryDatabaseByIdExecutor.java
index 2db07c33cf9..869e00b4443 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/MapQueryDatabaseByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/MapQueryDatabaseByIdExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.query;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/QueryAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/QueryAuthorizationExecutor.java
index 4a6fa3186d8..0278505c86d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/QueryAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/QueryAuthorizationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.asapi.v3.executor.query;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/QueryDatabaseAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/QueryDatabaseAuthorizationExecutor.java
index 53a10dd36d0..1d4a037ff81 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/QueryDatabaseAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/QueryDatabaseAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.query;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/SearchQueriesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/SearchQueriesOperationExecutor.java
index b23d83b2003..129bcaaff8e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/SearchQueriesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/SearchQueriesOperationExecutor.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.server.asapi.v3.executor.query;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.search.planner.ILocalSearchManager;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/SearchQueryDatabaseExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/SearchQueryDatabaseExecutor.java
index 9ce0c14e8c3..7d41835500b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/SearchQueryDatabaseExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/SearchQueryDatabaseExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.query;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/SearchQueryDatabasesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/SearchQueryDatabasesOperationExecutor.java
index f061671afe1..092888ccc56 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/SearchQueryDatabasesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/SearchQueryDatabasesOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, CISD
+ * 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.asapi.v3.executor.query;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/SearchQueryExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/SearchQueryExecutor.java
index d46bb66575b..908f6dc1592 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/SearchQueryExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/SearchQueryExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.query;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/SetQueryDatabaseExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/SetQueryDatabaseExecutor.java
index 44efa83a421..6457c51b003 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/SetQueryDatabaseExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/SetQueryDatabaseExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.query;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/UpdateQueriesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/UpdateQueriesOperationExecutor.java
index 39f44c12b97..f4c71b95f80 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/UpdateQueriesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/UpdateQueriesOperationExecutor.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.server.asapi.v3.executor.query;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/UpdateQueryDatabaseExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/UpdateQueryDatabaseExecutor.java
index daaf94e5c57..9344b78d8dc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/UpdateQueryDatabaseExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/UpdateQueryDatabaseExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.query;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/UpdateQueryExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/UpdateQueryExecutor.java
index 42bbed45c16..d991337f5db 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/UpdateQueryExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/query/UpdateQueryExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.asapi.v3.executor.query;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/relationship/GetRelationshipIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/relationship/GetRelationshipIdExecutor.java
index e4739c899d7..2462821eb07 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/relationship/GetRelationshipIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/relationship/GetRelationshipIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.relationship;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/relationship/IGetRelationshipIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/relationship/IGetRelationshipIdExecutor.java
index 80921091b37..d2d448a5049 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/relationship/IGetRelationshipIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/relationship/IGetRelationshipIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.relationship;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/rights/GetRightsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/rights/GetRightsExecutor.java
index 93967bd0223..acf57e6a52e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/rights/GetRightsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/rights/GetRightsExecutor.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.asapi.v3.executor.rights;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/rights/GetRightsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/rights/GetRightsOperationExecutor.java
index 7d34b9c783e..116e29a25ce 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/rights/GetRightsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/rights/GetRightsOperationExecutor.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.asapi.v3.executor.rights;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/rights/IGetRightsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/rights/IGetRightsExecutor.java
index 9e3d1a3b66a..e2d02753077 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/rights/IGetRightsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/rights/IGetRightsExecutor.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.asapi.v3.executor.rights;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/rights/IGetRightsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/rights/IGetRightsOperationExecutor.java
index f1acb263ae0..f89a3c300b9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/rights/IGetRightsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/rights/IGetRightsOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 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.asapi.v3.executor.rights;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/CreateRoleAssignmentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/CreateRoleAssignmentExecutor.java
index 215e3b9dd61..caaf4fba78e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/CreateRoleAssignmentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/CreateRoleAssignmentExecutor.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.asapi.v3.executor.roleassignment;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/CreateRoleAssignmentsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/CreateRoleAssignmentsOperationExecutor.java
index f67b53d6447..2c0c3e9f502 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/CreateRoleAssignmentsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/CreateRoleAssignmentsOperationExecutor.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.asapi.v3.executor.roleassignment;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/DeleteRoleAssignmentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/DeleteRoleAssignmentExecutor.java
index 4b6c7ef09fa..c6b1ac54754 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/DeleteRoleAssignmentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/DeleteRoleAssignmentExecutor.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.asapi.v3.executor.roleassignment;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/DeleteRoleAssignmentsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/DeleteRoleAssignmentsOperationExecutor.java
index b16a9bb4d76..9b1ae34f236 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/DeleteRoleAssignmentsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/DeleteRoleAssignmentsOperationExecutor.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.asapi.v3.executor.roleassignment;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/GetRoleAssignmentsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/GetRoleAssignmentsOperationExecutor.java
index 0b0d9b9a106..e45f32ad91a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/GetRoleAssignmentsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/GetRoleAssignmentsOperationExecutor.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.asapi.v3.executor.roleassignment;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ICreateRoleAssignmentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ICreateRoleAssignmentExecutor.java
index c4179772657..c738fb0858d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ICreateRoleAssignmentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ICreateRoleAssignmentExecutor.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.asapi.v3.executor.roleassignment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.roleassignment.create.RoleAssignmentCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ICreateRoleAssignmentsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ICreateRoleAssignmentsOperationExecutor.java
index 562b5a0b2bc..29c27afcbf3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ICreateRoleAssignmentsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ICreateRoleAssignmentsOperationExecutor.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.asapi.v3.executor.roleassignment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.create.ICreateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/IDeleteRoleAssignmentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/IDeleteRoleAssignmentExecutor.java
index 2a391d3fd8b..8a6276268df 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/IDeleteRoleAssignmentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/IDeleteRoleAssignmentExecutor.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.asapi.v3.executor.roleassignment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.roleassignment.delete.RoleAssignmentDeletionOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/IDeleteRoleAssignmentsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/IDeleteRoleAssignmentsOperationExecutor.java
index 03aa4140430..dd0ee39fbd1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/IDeleteRoleAssignmentsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/IDeleteRoleAssignmentsOperationExecutor.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.asapi.v3.executor.roleassignment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.delete.IDeleteObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/IGetRoleAssignmentsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/IGetRoleAssignmentsOperationExecutor.java
index 56dd311fc1c..9acca4c404e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/IGetRoleAssignmentsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/IGetRoleAssignmentsOperationExecutor.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.asapi.v3.executor.roleassignment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/IMapRoleAssignmentPEByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/IMapRoleAssignmentPEByIdExecutor.java
index 21adef7cff0..e2db08280f5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/IMapRoleAssignmentPEByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/IMapRoleAssignmentPEByIdExecutor.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.asapi.v3.executor.roleassignment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.roleassignment.id.IRoleAssignmentId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/IMapRoleAssignmentTechIdByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/IMapRoleAssignmentTechIdByIdExecutor.java
index e532c2db9cf..b81e836350c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/IMapRoleAssignmentTechIdByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/IMapRoleAssignmentTechIdByIdExecutor.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.asapi.v3.executor.roleassignment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.roleassignment.id.IRoleAssignmentId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/IRoleAssignmentAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/IRoleAssignmentAuthorizationExecutor.java
index b5994be682b..ea3d64ab23a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/IRoleAssignmentAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/IRoleAssignmentAuthorizationExecutor.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.asapi.v3.executor.roleassignment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ISearchRoleAssignmentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ISearchRoleAssignmentExecutor.java
index cbb7057599d..b8ddb9b77ea 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ISearchRoleAssignmentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ISearchRoleAssignmentExecutor.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.asapi.v3.executor.roleassignment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.roleassignment.search.RoleAssignmentSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ISearchRoleAssignmentsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ISearchRoleAssignmentsOperationExecutor.java
index f9b11b43818..2f157236035 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ISearchRoleAssignmentsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ISearchRoleAssignmentsOperationExecutor.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.asapi.v3.executor.roleassignment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ISetRoleAssignmentAuthorizationGroupExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ISetRoleAssignmentAuthorizationGroupExecutor.java
index a195e022a96..ebb560afbb3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ISetRoleAssignmentAuthorizationGroupExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ISetRoleAssignmentAuthorizationGroupExecutor.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.asapi.v3.executor.roleassignment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.roleassignment.create.RoleAssignmentCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ISetRoleAssignmentProjectExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ISetRoleAssignmentProjectExecutor.java
index 976adfb6ac5..9c5c0cf542e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ISetRoleAssignmentProjectExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ISetRoleAssignmentProjectExecutor.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.asapi.v3.executor.roleassignment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.roleassignment.create.RoleAssignmentCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ISetRoleAssignmentSpaceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ISetRoleAssignmentSpaceExecutor.java
index 1b76ca4231e..50928ca22dd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ISetRoleAssignmentSpaceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ISetRoleAssignmentSpaceExecutor.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.asapi.v3.executor.roleassignment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.roleassignment.create.RoleAssignmentCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ISetRoleAssignmentUserExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ISetRoleAssignmentUserExecutor.java
index 94fad0f96b7..61fbbef61cb 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ISetRoleAssignmentUserExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/ISetRoleAssignmentUserExecutor.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.asapi.v3.executor.roleassignment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.roleassignment.create.RoleAssignmentCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/MapRoleAssignmentPEByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/MapRoleAssignmentPEByIdExecutor.java
index 8890a0bcebe..bec46c1c175 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/MapRoleAssignmentPEByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/MapRoleAssignmentPEByIdExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 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.ethz.sis.openbis.generic.server.asapi.v3.executor.roleassignment;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/MapRoleAssignmentTechIdByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/MapRoleAssignmentTechIdByIdExecutor.java
index 549caf12f11..ce9e2f0f95c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/MapRoleAssignmentTechIdByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/MapRoleAssignmentTechIdByIdExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 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.ethz.sis.openbis.generic.server.asapi.v3.executor.roleassignment;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/RoleAssignmentAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/RoleAssignmentAuthorizationExecutor.java
index 39cdc810fca..0cbe0bcfed1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/RoleAssignmentAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/RoleAssignmentAuthorizationExecutor.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.asapi.v3.executor.roleassignment;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/SearchRoleAssignmentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/SearchRoleAssignmentExecutor.java
index 7e21d0f8b5f..2d42214500b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/SearchRoleAssignmentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/SearchRoleAssignmentExecutor.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.asapi.v3.executor.roleassignment;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/SearchRoleAssignmentsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/SearchRoleAssignmentsOperationExecutor.java
index d0c361dbee3..c5a9a6563dc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/SearchRoleAssignmentsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/SearchRoleAssignmentsOperationExecutor.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.asapi.v3.executor.roleassignment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.search.planner.ILocalSearchManager;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/SetRoleAssignmentAuthorizationGroupExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/SetRoleAssignmentAuthorizationGroupExecutor.java
index 8e0be901c74..10146da339c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/SetRoleAssignmentAuthorizationGroupExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/SetRoleAssignmentAuthorizationGroupExecutor.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.asapi.v3.executor.roleassignment;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/SetRoleAssignmentProjectExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/SetRoleAssignmentProjectExecutor.java
index 9c4d3a09dd9..b0f9384598e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/SetRoleAssignmentProjectExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/SetRoleAssignmentProjectExecutor.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.asapi.v3.executor.roleassignment;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/SetRoleAssignmentSpaceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/SetRoleAssignmentSpaceExecutor.java
index 2b2c2aeca4f..ac229f60460 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/SetRoleAssignmentSpaceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/SetRoleAssignmentSpaceExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 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.ethz.sis.openbis.generic.server.asapi.v3.executor.roleassignment;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/SetRoleAssignmentUserExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/SetRoleAssignmentUserExecutor.java
index 3349273cff8..74849f56c39 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/SetRoleAssignmentUserExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/roleassignment/SetRoleAssignmentUserExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 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.ethz.sis.openbis.generic.server.asapi.v3.executor.roleassignment;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/AbstractUpdateSampleToSampleParentChildRelationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/AbstractUpdateSampleToSampleParentChildRelationExecutor.java
index 27e04cd6b69..63549f41769 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/AbstractUpdateSampleToSampleParentChildRelationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/AbstractUpdateSampleToSampleParentChildRelationExecutor.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.asapi.v3.executor.sample;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/CreateSampleExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/CreateSampleExecutor.java
index 48c24fe2e86..e7776a26606 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/CreateSampleExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/CreateSampleExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/CreateSampleTypesExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/CreateSampleTypesExecutor.java
index 30e4a6eaa12..3bf87c8b40b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/CreateSampleTypesExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/CreateSampleTypesExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/CreateSampleTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/CreateSampleTypesOperationExecutor.java
index fdb3a973f9f..1cd8c500fec 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/CreateSampleTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/CreateSampleTypesOperationExecutor.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.server.asapi.v3.executor.sample;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/CreateSamplesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/CreateSamplesOperationExecutor.java
index 6e98e44f175..a3100e05ca4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/CreateSamplesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/CreateSamplesOperationExecutor.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.server.asapi.v3.executor.sample;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/DeleteSampleExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/DeleteSampleExecutor.java
index 444517add0f..79f6ac5282f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/DeleteSampleExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/DeleteSampleExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/DeleteSampleTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/DeleteSampleTypesOperationExecutor.java
index ff37390acb7..445077a134d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/DeleteSampleTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/DeleteSampleTypesOperationExecutor.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.asapi.v3.executor.sample;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/DeleteSamplesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/DeleteSamplesOperationExecutor.java
index 0d4791dfa7a..3a53d947dfb 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/DeleteSamplesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/DeleteSamplesOperationExecutor.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.server.asapi.v3.executor.sample;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/GetSampleTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/GetSampleTypesOperationExecutor.java
index 9f77c5d8f44..d3ffc538f09 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/GetSampleTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/GetSampleTypesOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/GetSamplesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/GetSamplesOperationExecutor.java
index 7cc67018442..45eaa2876f8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/GetSamplesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/GetSamplesOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ICreateSampleExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ICreateSampleExecutor.java
index b05326d5a54..28ec880b28f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ICreateSampleExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ICreateSampleExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.create.SampleCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ICreateSampleTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ICreateSampleTypeExecutor.java
index 951414c957b..25c4aa970a7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ICreateSampleTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ICreateSampleTypeExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.id.EntityTypePermId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ICreateSampleTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ICreateSampleTypesOperationExecutor.java
index c45b5c79b23..1e84f3ad069 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ICreateSampleTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ICreateSampleTypesOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.create.ICreateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ICreateSamplesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ICreateSamplesOperationExecutor.java
index 4102718ba42..465aa43b1ca 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ICreateSamplesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ICreateSamplesOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.create.ICreateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IDeleteSampleExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IDeleteSampleExecutor.java
index b242d7bc0f0..f96b71e81b6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IDeleteSampleExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IDeleteSampleExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.id.IDeletionId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IDeleteSampleTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IDeleteSampleTypesOperationExecutor.java
index d964e1bc2f4..880b7d1ef93 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IDeleteSampleTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IDeleteSampleTypesOperationExecutor.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.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.delete.IDeleteObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IDeleteSamplesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IDeleteSamplesOperationExecutor.java
index 96106c4b9cb..d45e46e5570 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IDeleteSamplesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IDeleteSamplesOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.delete.IDeleteObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IGetSampleTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IGetSampleTypesOperationExecutor.java
index 4c70c8b2559..121efc87356 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IGetSampleTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IGetSampleTypesOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IGetSamplesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IGetSamplesOperationExecutor.java
index 9d360e90525..2f849367061 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IGetSamplesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IGetSamplesOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IMapSampleByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IMapSampleByIdExecutor.java
index 905572ca5f4..1f4260895e7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IMapSampleByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IMapSampleByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.id.ISampleId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IMapSampleTechIdByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IMapSampleTechIdByIdExecutor.java
index fd4dfd6b7f5..748f9564c37 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IMapSampleTechIdByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IMapSampleTechIdByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.id.ISampleId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISampleAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISampleAuthorizationExecutor.java
index b7eba6b9a43..c2ac832d3aa 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISampleAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISampleAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.id.ISampleId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISampleTypeAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISampleTypeAuthorizationExecutor.java
index ede310e305c..85c75672c5b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISampleTypeAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISampleTypeAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISearchSampleExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISearchSampleExecutor.java
index 4b42f91f89e..151f421c3d7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISearchSampleExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISearchSampleExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.search.SampleSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISearchSampleTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISearchSampleTypeExecutor.java
index 890782f33bf..117d9969ae9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISearchSampleTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISearchSampleTypeExecutor.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.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.search.SampleTypeSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISearchSampleTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISearchSampleTypesOperationExecutor.java
index 75316b118a4..eec73b755b9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISearchSampleTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISearchSampleTypesOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISearchSamplesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISearchSamplesOperationExecutor.java
index 92667e10597..e57a7e9d648 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISearchSamplesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISearchSamplesOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleChildrenExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleChildrenExecutor.java
index 0f55c2f73b9..2863b3ee09a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleChildrenExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleChildrenExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.create.SampleCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleComponentsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleComponentsExecutor.java
index dc0bf56ab46..5c0d47455ca 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleComponentsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleComponentsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.create.SampleCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleContainerExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleContainerExecutor.java
index a63d44e6e3b..b262e2e9019 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleContainerExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleContainerExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.create.SampleCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleExperimentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleExperimentExecutor.java
index fb7f466b039..182a4d769cc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleExperimentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleExperimentExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.create.SampleCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleParentsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleParentsExecutor.java
index 4b9d64c009f..b29fdab7436 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleParentsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleParentsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.create.SampleCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleProjectExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleProjectExecutor.java
index 95e7fccd0c7..a97f5ded1c5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleProjectExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleProjectExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.create.SampleCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleRelatedSamplesExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleRelatedSamplesExecutor.java
index 0dc7d06c36b..3c7f5e5bfef 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleRelatedSamplesExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleRelatedSamplesExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.create.SampleCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleSpaceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleSpaceExecutor.java
index 31f20c873be..df72916db26 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleSpaceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleSpaceExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.create.SampleCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleTypeExecutor.java
index 58d4c983962..a6c84b42ff9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISetSampleTypeExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.create.SampleCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleAttachmentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleAttachmentExecutor.java
index 1743f5461d6..7396d62d045 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleAttachmentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleAttachmentExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.attachment.IAbstractUpdateAttachmentForEntityExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleChildrenExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleChildrenExecutor.java
index 1da55af1848..7d9f6f50282 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleChildrenExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleChildrenExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.id.ISampleId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleComponentsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleComponentsExecutor.java
index 2fa99a37d09..b39e6f6960c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleComponentsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleComponentsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.id.ISampleId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleContainerExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleContainerExecutor.java
index e2fb726fa7d..dc3bece189f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleContainerExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleContainerExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.id.ISampleId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleExecutor.java
index 2201299eefc..6a1dd2dcf30 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.id.SamplePermId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleExperimentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleExperimentExecutor.java
index b10d013fb7f..3f6141f2f65 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleExperimentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleExperimentExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.update.SampleUpdate;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleParentsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleParentsExecutor.java
index 04f24c7b340..064d2d52d8b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleParentsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleParentsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.id.ISampleId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleProjectExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleProjectExecutor.java
index 4104f13088c..bdc94c603cd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleProjectExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleProjectExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.update.SampleUpdate;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSamplePropertyExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSamplePropertyExecutor.java
index 25bf398f6c9..55f8610f31f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSamplePropertyExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSamplePropertyExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.property.IAbstractUpdateEntityPropertyExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleRelatedSamplesExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleRelatedSamplesExecutor.java
index 1a09815dba4..fa28450951b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleRelatedSamplesExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleRelatedSamplesExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.update.SampleUpdate;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleSpaceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleSpaceExecutor.java
index d78d53c6ca8..417bc7dfa1e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleSpaceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleSpaceExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.update.SampleUpdate;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleTypeExecutor.java
index d4d0aafe436..7346363ff19 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleTypeExecutor.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.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.id.EntityTypePermId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleTypePropertyTypesExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleTypePropertyTypesExecutor.java
index 4f5f57936ac..1fb57e29301 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleTypePropertyTypesExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleTypePropertyTypesExecutor.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.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.update.SampleTypeUpdate;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleTypesOperationExecutor.java
index e989b3bc871..3a3d8b090fb 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSampleTypesOperationExecutor.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.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.update.IUpdateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSamplesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSamplesOperationExecutor.java
index 55cb7bc71f9..4a2ecbb7b9f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSamplesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IUpdateSamplesOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.update.IUpdateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IVerifySampleContainerExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IVerifySampleContainerExecutor.java
index 16f593259c2..6baf521e98c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IVerifySampleContainerExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IVerifySampleContainerExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IVerifySampleDataSetsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IVerifySampleDataSetsExecutor.java
index 869d7e98bb7..42602fab4f7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IVerifySampleDataSetsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IVerifySampleDataSetsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IVerifySampleExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IVerifySampleExecutor.java
index 3dda8a8742e..da9d5f43e05 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IVerifySampleExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IVerifySampleExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.id.ISampleId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IVerifySampleExperimentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IVerifySampleExperimentExecutor.java
index 84d7baf51ec..f66afcbced1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IVerifySampleExperimentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IVerifySampleExperimentExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IVerifySampleParentsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IVerifySampleParentsExecutor.java
index 965dfed4363..2b48d9646a4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IVerifySampleParentsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IVerifySampleParentsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.entity.IVerifyEntityRelationsExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IVerifySampleProjectExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IVerifySampleProjectExecutor.java
index 0be4cdaf664..d97e0283503 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IVerifySampleProjectExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IVerifySampleProjectExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IVerifySamplesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IVerifySamplesOperationExecutor.java
index 33c25d6b379..2e621273c2a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IVerifySamplesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/IVerifySamplesOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.verify.IVerifyObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/MapSampleByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/MapSampleByIdExecutor.java
index c745b522fbf..78a2bd0dd5f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/MapSampleByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/MapSampleByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/MapSampleTechIdByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/MapSampleTechIdByIdExecutor.java
index 0eb1601efae..b561ea0e76f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/MapSampleTechIdByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/MapSampleTechIdByIdExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SampleAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SampleAuthorizationExecutor.java
index a74defaf4ac..41070b0b5f2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SampleAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SampleAuthorizationExecutor.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.server.asapi.v3.executor.sample;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SampleTypeAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SampleTypeAuthorizationExecutor.java
index bcf0de78b32..e73fd67a725 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SampleTypeAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SampleTypeAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SearchSampleExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SearchSampleExecutor.java
index 01b5974393f..3da9bd66253 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SearchSampleExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SearchSampleExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SearchSampleTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SearchSampleTypeExecutor.java
index 30c34973b6e..fdf2d258a56 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SearchSampleTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SearchSampleTypeExecutor.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.asapi.v3.executor.sample;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SearchSampleTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SearchSampleTypesOperationExecutor.java
index e02dfb0982a..547a0ac7662 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SearchSampleTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SearchSampleTypesOperationExecutor.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.server.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SearchSamplesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SearchSamplesOperationExecutor.java
index 4f6b18d00d2..46d08a072fd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SearchSamplesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SearchSamplesOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.asapi.v3.executor.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleChildrenExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleChildrenExecutor.java
index 86442ffde59..48604251e4c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleChildrenExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleChildrenExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleComponentsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleComponentsExecutor.java
index 231c3c7ff15..997a82dfff7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleComponentsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleComponentsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleContainerExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleContainerExecutor.java
index 8cf4a558c99..89a883f425e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleContainerExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleContainerExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleExperimentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleExperimentExecutor.java
index 84e01bb4687..c4a35937e5d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleExperimentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleExperimentExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleParentsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleParentsExecutor.java
index ee2e48b6aec..cab3e1339bf 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleParentsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleParentsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleProjectExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleProjectExecutor.java
index 3811291fcff..aaed7bfda1e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleProjectExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleProjectExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleSpaceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleSpaceExecutor.java
index 8e12ea10756..16813baaede 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleSpaceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleSpaceExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleToSampleParentChildRelationExceutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleToSampleParentChildRelationExceutor.java
index 82af5ef08e3..4a3ae2a979a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleToSampleParentChildRelationExceutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleToSampleParentChildRelationExceutor.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.asapi.v3.executor.sample;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleToSamplesRelationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleToSamplesRelationExecutor.java
index 0eed35b0702..925cc855c63 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleToSamplesRelationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleToSamplesRelationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleTypeExecutor.java
index c5242aae315..a615d0abefc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleTypeExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleAttachmentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleAttachmentExecutor.java
index ff9f3b5da3d..a9a319f8618 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleAttachmentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleAttachmentExecutor.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.asapi.v3.executor.sample;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleChildrenExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleChildrenExecutor.java
index 142ce530eba..6e096e9f94f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleChildrenExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleChildrenExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleComponentsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleComponentsExecutor.java
index 6d6f0a25199..61daf732cc7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleComponentsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleComponentsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleContainerExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleContainerExecutor.java
index 4753f01da4b..778c8d540ec 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleContainerExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleContainerExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleExecutor.java
index d2d62cfc1af..089b1d4f529 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleExperimentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleExperimentExecutor.java
index 2dc1ea926a4..0e3a6afe855 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleExperimentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleExperimentExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleParentsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleParentsExecutor.java
index 786b00781b5..d926262cd02 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleParentsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleParentsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleProjectExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleProjectExecutor.java
index f007917e1c4..abf213c0bac 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleProjectExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleProjectExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSamplePropertyExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSamplePropertyExecutor.java
index d881116e22a..744fdb1dde4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSamplePropertyExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSamplePropertyExecutor.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.asapi.v3.executor.sample;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleRelatedSamplesExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleRelatedSamplesExecutor.java
index 5d104d91286..c8db071a5a1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleRelatedSamplesExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleRelatedSamplesExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleSpaceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleSpaceExecutor.java
index d8102091931..ebcaf2c3e7d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleSpaceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleSpaceExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleTypeExecutor.java
index c5fd3c70fbf..d587dcee175 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleTypeExecutor.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.asapi.v3.executor.sample;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleTypePropertyTypesExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleTypePropertyTypesExecutor.java
index 8958b2351cf..dfcb48748f4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleTypePropertyTypesExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleTypePropertyTypesExecutor.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.asapi.v3.executor.sample;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleTypesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleTypesOperationExecutor.java
index 97094ff2bdc..bf63d4daf59 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleTypesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleTypesOperationExecutor.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.asapi.v3.executor.sample;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSamplesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSamplesOperationExecutor.java
index 644ef1024f0..ebc0ebb214d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSamplesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSamplesOperationExecutor.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.server.asapi.v3.executor.sample;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/VerifySampleContainerExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/VerifySampleContainerExecutor.java
index 3aa68dac212..5b15079c8bb 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/VerifySampleContainerExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/VerifySampleContainerExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/VerifySampleDataSetsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/VerifySampleDataSetsExecutor.java
index 063530c0c97..c95dd8be3c7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/VerifySampleDataSetsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/VerifySampleDataSetsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/VerifySampleExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/VerifySampleExecutor.java
index b68b64e2a30..b189354cd2f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/VerifySampleExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/VerifySampleExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/VerifySampleExperimentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/VerifySampleExperimentExecutor.java
index 2df942c1121..2eee930a3e2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/VerifySampleExperimentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/VerifySampleExperimentExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/VerifySampleParentsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/VerifySampleParentsExecutor.java
index 4fc499a2ab6..6661dd1cf75 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/VerifySampleParentsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/VerifySampleParentsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/VerifySampleProjectExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/VerifySampleProjectExecutor.java
index df258036942..0f4b3f5ef9a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/VerifySampleProjectExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/VerifySampleProjectExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/VerifySamplesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/VerifySamplesOperationExecutor.java
index 3e90e1df1d1..9f4f8588136 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/VerifySamplesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/VerifySamplesOperationExecutor.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.server.asapi.v3.executor.sample;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/CreateSemanticAnnotationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/CreateSemanticAnnotationExecutor.java
index 948059eac3a..7b2c8b21748 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/CreateSemanticAnnotationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/CreateSemanticAnnotationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.ethz.sis.openbis.generic.server.asapi.v3.executor.semanticannotation;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/CreateSemanticAnnotationsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/CreateSemanticAnnotationsOperationExecutor.java
index 389835f6d03..fdc3dc70f4f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/CreateSemanticAnnotationsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/CreateSemanticAnnotationsOperationExecutor.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.server.asapi.v3.executor.semanticannotation;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/DeleteSemanticAnnotationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/DeleteSemanticAnnotationExecutor.java
index 429a05bc69a..b5609ca5320 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/DeleteSemanticAnnotationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/DeleteSemanticAnnotationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.semanticannotation;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/DeleteSemanticAnnotationsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/DeleteSemanticAnnotationsOperationExecutor.java
index b6b2204ae8e..868bf737dca 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/DeleteSemanticAnnotationsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/DeleteSemanticAnnotationsOperationExecutor.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.server.asapi.v3.executor.semanticannotation;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/GetSemanticAnnotationsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/GetSemanticAnnotationsOperationExecutor.java
index 268bccf6e30..1cb088f5715 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/GetSemanticAnnotationsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/GetSemanticAnnotationsOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.executor.semanticannotation;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ICreateSemanticAnnotationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ICreateSemanticAnnotationExecutor.java
index e7b4b31c0de..9a6b2659d8c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ICreateSemanticAnnotationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ICreateSemanticAnnotationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.semanticannotation;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.semanticannotation.create.SemanticAnnotationCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ICreateSemanticAnnotationsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ICreateSemanticAnnotationsOperationExecutor.java
index d334c295bb3..d0b25ab51ba 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ICreateSemanticAnnotationsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ICreateSemanticAnnotationsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.semanticannotation;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.create.ICreateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/IDeleteSemanticAnnotationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/IDeleteSemanticAnnotationExecutor.java
index e0105f9ce2f..23c0dd5caad 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/IDeleteSemanticAnnotationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/IDeleteSemanticAnnotationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.semanticannotation;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.semanticannotation.delete.SemanticAnnotationDeletionOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/IDeleteSemanticAnnotationsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/IDeleteSemanticAnnotationsOperationExecutor.java
index 3e13acb9358..caf707fcfb0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/IDeleteSemanticAnnotationsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/IDeleteSemanticAnnotationsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.semanticannotation;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.delete.IDeleteObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/IGetSemanticAnnotationsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/IGetSemanticAnnotationsOperationExecutor.java
index 7d9c3ccea4e..7fc80ea139f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/IGetSemanticAnnotationsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/IGetSemanticAnnotationsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.semanticannotation;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/IMapSemanticAnnotationByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/IMapSemanticAnnotationByIdExecutor.java
index 2f6e29a54d3..81cbcafd909 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/IMapSemanticAnnotationByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/IMapSemanticAnnotationByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.semanticannotation;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.semanticannotation.id.ISemanticAnnotationId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/IMapSemanticAnnotationTechIdByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/IMapSemanticAnnotationTechIdByIdExecutor.java
index 239eca1612b..e9fd8188190 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/IMapSemanticAnnotationTechIdByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/IMapSemanticAnnotationTechIdByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.semanticannotation;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.semanticannotation.id.ISemanticAnnotationId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ISearchSemanticAnnotationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ISearchSemanticAnnotationExecutor.java
index 847bdaacfb9..791a438f162 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ISearchSemanticAnnotationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ISearchSemanticAnnotationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.semanticannotation;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.semanticannotation.search.SemanticAnnotationSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ISearchSemanticAnnotationsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ISearchSemanticAnnotationsOperationExecutor.java
index e7fbe2b65a7..e1b0a16b27b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ISearchSemanticAnnotationsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ISearchSemanticAnnotationsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.semanticannotation;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ISemanticAnnotationAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ISemanticAnnotationAuthorizationExecutor.java
index 4a1d27369ca..40b54f63653 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ISemanticAnnotationAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ISemanticAnnotationAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.semanticannotation;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.semanticannotation.id.ISemanticAnnotationId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ISetSemanticAnnotationEntityTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ISetSemanticAnnotationEntityTypeExecutor.java
index 2ac571d154b..dc7e99da8e9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ISetSemanticAnnotationEntityTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ISetSemanticAnnotationEntityTypeExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.semanticannotation;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.semanticannotation.create.SemanticAnnotationCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ISetSemanticAnnotationPropertyAssignmentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ISetSemanticAnnotationPropertyAssignmentExecutor.java
index f4ca6a14a1e..7d06ef2f5fd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ISetSemanticAnnotationPropertyAssignmentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ISetSemanticAnnotationPropertyAssignmentExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.semanticannotation;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.semanticannotation.create.SemanticAnnotationCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ISetSemanticAnnotationPropertyTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ISetSemanticAnnotationPropertyTypeExecutor.java
index 5c99dfb59ef..620bb9bb6ca 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ISetSemanticAnnotationPropertyTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/ISetSemanticAnnotationPropertyTypeExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.semanticannotation;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.semanticannotation.create.SemanticAnnotationCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/IUpdateSemanticAnnotationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/IUpdateSemanticAnnotationExecutor.java
index f733c4a5a86..0f61a6fe580 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/IUpdateSemanticAnnotationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/IUpdateSemanticAnnotationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.semanticannotation;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.semanticannotation.id.SemanticAnnotationPermId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/IUpdateSemanticAnnotationsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/IUpdateSemanticAnnotationsOperationExecutor.java
index 42529ec1468..57c375a453c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/IUpdateSemanticAnnotationsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/IUpdateSemanticAnnotationsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.semanticannotation;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.update.IUpdateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/MapSemanticAnnotationByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/MapSemanticAnnotationByIdExecutor.java
index 54d992b4a12..3738a9408e7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/MapSemanticAnnotationByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/MapSemanticAnnotationByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.semanticannotation;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/MapSemanticAnnotationTechIdByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/MapSemanticAnnotationTechIdByIdExecutor.java
index 86feeb1e239..b4534768e05 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/MapSemanticAnnotationTechIdByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/MapSemanticAnnotationTechIdByIdExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.executor.semanticannotation;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/SearchSemanticAnnotationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/SearchSemanticAnnotationExecutor.java
index 796124849b0..76bd1357610 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/SearchSemanticAnnotationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/SearchSemanticAnnotationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.executor.semanticannotation;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/SearchSemanticAnnotationsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/SearchSemanticAnnotationsOperationExecutor.java
index 35aa36be7a1..b84b6ec3ac7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/SearchSemanticAnnotationsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/SearchSemanticAnnotationsOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.executor.semanticannotation;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.search.planner.ILocalSearchManager;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/SemanticAnnotationAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/SemanticAnnotationAuthorizationExecutor.java
index bc6bacad381..4620e1099aa 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/SemanticAnnotationAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/SemanticAnnotationAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.semanticannotation;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/SetSemanticAnnotationEntityTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/SetSemanticAnnotationEntityTypeExecutor.java
index 1e1660ca22b..04dc9dcb194 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/SetSemanticAnnotationEntityTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/SetSemanticAnnotationEntityTypeExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.executor.semanticannotation;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/SetSemanticAnnotationPropertyAssignmentExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/SetSemanticAnnotationPropertyAssignmentExecutor.java
index 1eecfa7dce3..45c7df9e815 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/SetSemanticAnnotationPropertyAssignmentExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/SetSemanticAnnotationPropertyAssignmentExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.executor.semanticannotation;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/SetSemanticAnnotationPropertyTypeExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/SetSemanticAnnotationPropertyTypeExecutor.java
index b0a5616ba05..41207eefcb2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/SetSemanticAnnotationPropertyTypeExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/SetSemanticAnnotationPropertyTypeExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.executor.semanticannotation;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/UpdateSemanticAnnotationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/UpdateSemanticAnnotationExecutor.java
index c6ea31e05d8..2896a5d5ad2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/UpdateSemanticAnnotationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/UpdateSemanticAnnotationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.ethz.sis.openbis.generic.server.asapi.v3.executor.semanticannotation;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/UpdateSemanticAnnotationsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/UpdateSemanticAnnotationsOperationExecutor.java
index 698e17dc064..5dbb2378e4e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/UpdateSemanticAnnotationsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/semanticannotation/UpdateSemanticAnnotationsOperationExecutor.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.server.asapi.v3.executor.semanticannotation;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/AbstractDataSetBasedDssServiceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/AbstractDataSetBasedDssServiceExecutor.java
index 72d19cc1943..24ae8cf4fe2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/AbstractDataSetBasedDssServiceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/AbstractDataSetBasedDssServiceExecutor.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.asapi.v3.executor.service;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/AbstractDssServiceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/AbstractDssServiceExecutor.java
index 5633cfbb6b2..22cf166ecbb 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/AbstractDssServiceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/AbstractDssServiceExecutor.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.asapi.v3.executor.service;
 
 import org.apache.commons.lang3.StringUtils;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/AggregationServiceAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/AggregationServiceAuthorizationExecutor.java
index 4bd074bc404..9972a89d792 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/AggregationServiceAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/AggregationServiceAuthorizationExecutor.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.asapi.v3.executor.service;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/CustomASServiceAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/CustomASServiceAuthorizationExecutor.java
index 64f666cf0b4..ed58f200ea1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/CustomASServiceAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/CustomASServiceAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.service;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/CustomASServiceProvider.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/CustomASServiceProvider.java
index adb6fe9ad12..ecad75e4091 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/CustomASServiceProvider.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/CustomASServiceProvider.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.ethz.sis.openbis.generic.server.asapi.v3.executor.service;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteAggregationServiceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteAggregationServiceExecutor.java
index 4a29d303358..435cee6507d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteAggregationServiceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteAggregationServiceExecutor.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.asapi.v3.executor.service;
 
 import javax.annotation.Resource;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteAggregationServiceOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteAggregationServiceOperationExecutor.java
index 6664e8b7353..f422420ff3e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteAggregationServiceOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteAggregationServiceOperationExecutor.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.server.asapi.v3.executor.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteCustomASServiceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteCustomASServiceExecutor.java
index 26c93489c46..ce09fe522fc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteCustomASServiceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteCustomASServiceExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.asapi.v3.executor.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteCustomASServiceOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteCustomASServiceOperationExecutor.java
index 5483ad5483d..20f59d090e6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteCustomASServiceOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteCustomASServiceOperationExecutor.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.server.asapi.v3.executor.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteProcessingServiceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteProcessingServiceExecutor.java
index 240ae48f6a2..04401bd7486 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteProcessingServiceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteProcessingServiceExecutor.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.asapi.v3.executor.service;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteProcessingServiceOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteProcessingServiceOperationExecutor.java
index b691de5fa5b..24c6f272846 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteProcessingServiceOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteProcessingServiceOperationExecutor.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.server.asapi.v3.executor.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteReportingServiceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteReportingServiceExecutor.java
index 191d3e923d7..339ab1b5991 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteReportingServiceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteReportingServiceExecutor.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.asapi.v3.executor.service;
 
 import javax.annotation.Resource;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteReportingServiceOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteReportingServiceOperationExecutor.java
index f38523e1a53..d3a3c3c3766 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteReportingServiceOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteReportingServiceOperationExecutor.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.server.asapi.v3.executor.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteSearchDomainServiceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteSearchDomainServiceExecutor.java
index b66b2704147..a731147c4ad 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteSearchDomainServiceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteSearchDomainServiceExecutor.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.asapi.v3.executor.service;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteSearchDomainServiceOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteSearchDomainServiceOperationExecutor.java
index f08c066cde7..fbadd7c8e42 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteSearchDomainServiceOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ExecuteSearchDomainServiceOperationExecutor.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.server.asapi.v3.executor.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IAggregationServiceAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IAggregationServiceAuthorizationExecutor.java
index dd6bd754f9b..eaadc3155c8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IAggregationServiceAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IAggregationServiceAuthorizationExecutor.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.asapi.v3.executor.service;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ICustomASServiceAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ICustomASServiceAuthorizationExecutor.java
index 738dd588f7c..50f21c8df46 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ICustomASServiceAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ICustomASServiceAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.service;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ICustomASServiceProvider.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ICustomASServiceProvider.java
index 1b5ce95daca..6db5ca18d5b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ICustomASServiceProvider.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ICustomASServiceProvider.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.ethz.sis.openbis.generic.server.asapi.v3.executor.service;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteAggregationServiceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteAggregationServiceExecutor.java
index f16d20b479e..a63a588ec82 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteAggregationServiceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteAggregationServiceExecutor.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.asapi.v3.executor.service;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.TableModel;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteAggregationServiceOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteAggregationServiceOperationExecutor.java
index 196a99c307e..5c28d6fb617 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteAggregationServiceOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteAggregationServiceOperationExecutor.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.asapi.v3.executor.service;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteCustomASServiceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteCustomASServiceExecutor.java
index 41d9ea30fb4..51b59d54324 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteCustomASServiceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteCustomASServiceExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.service;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.service.CustomASServiceExecutionOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteCustomASServiceOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteCustomASServiceOperationExecutor.java
index d6719805e45..9305706a552 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteCustomASServiceOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteCustomASServiceOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.service;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteDssServiceOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteDssServiceOperationExecutor.java
index b5833acc9de..aafd1dc0dd8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteDssServiceOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteDssServiceOperationExecutor.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.asapi.v3.executor.service;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteProcessingServiceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteProcessingServiceExecutor.java
index b81f1403cc6..b1fb5b45069 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteProcessingServiceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteProcessingServiceExecutor.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.asapi.v3.executor.service;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.service.execute.ProcessingServiceExecutionOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteProcessingServiceOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteProcessingServiceOperationExecutor.java
index 3d2278b1b76..e6af92e0b8c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteProcessingServiceOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteProcessingServiceOperationExecutor.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.asapi.v3.executor.service;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteReportingServiceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteReportingServiceExecutor.java
index bb0bd1f39c8..6ceeadc4d78 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteReportingServiceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteReportingServiceExecutor.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.asapi.v3.executor.service;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.TableModel;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteReportingServiceOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteReportingServiceOperationExecutor.java
index fd91116c065..bd496768347 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteReportingServiceOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteReportingServiceOperationExecutor.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.asapi.v3.executor.service;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteSearchDomainServiceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteSearchDomainServiceExecutor.java
index b00318a455c..7ec4ef5f4f8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteSearchDomainServiceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteSearchDomainServiceExecutor.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.asapi.v3.executor.service;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchResult;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteSearchDomainServiceOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteSearchDomainServiceOperationExecutor.java
index 34c90903c89..da5ea6e2131 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteSearchDomainServiceOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IExecuteSearchDomainServiceOperationExecutor.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.asapi.v3.executor.service;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IProcessingServiceAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IProcessingServiceAuthorizationExecutor.java
index 01a45007181..30cae24e7b5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IProcessingServiceAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IProcessingServiceAuthorizationExecutor.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.asapi.v3.executor.service;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IReportingServiceAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IReportingServiceAuthorizationExecutor.java
index 1181fc1cd9d..f89435427ea 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IReportingServiceAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/IReportingServiceAuthorizationExecutor.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.asapi.v3.executor.service;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchAggregationServiceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchAggregationServiceExecutor.java
index bde57cb8e55..e2c46205bfb 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchAggregationServiceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchAggregationServiceExecutor.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.asapi.v3.executor.service;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.service.AggregationService;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchAggregationServicesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchAggregationServicesOperationExecutor.java
index f5048ae4b12..ac13ff4f72d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchAggregationServicesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchAggregationServicesOperationExecutor.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.asapi.v3.executor.service;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchCustomASServiceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchCustomASServiceExecutor.java
index c33c8c7f773..20a80362239 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchCustomASServiceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchCustomASServiceExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.service;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.service.CustomASService;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchCustomASServicesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchCustomASServicesOperationExecutor.java
index 8889518032f..58d484c33ad 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchCustomASServicesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchCustomASServicesOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.service;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchDomainServiceAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchDomainServiceAuthorizationExecutor.java
index ad0541f4ce6..dbc55237750 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchDomainServiceAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchDomainServiceAuthorizationExecutor.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.asapi.v3.executor.service;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchProcessingServiceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchProcessingServiceExecutor.java
index 35e3e9b45db..bee45969564 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchProcessingServiceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchProcessingServiceExecutor.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.asapi.v3.executor.service;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.service.ProcessingService;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchProcessingServicesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchProcessingServicesOperationExecutor.java
index e6dda01fdc5..b0493040b0f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchProcessingServicesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchProcessingServicesOperationExecutor.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.asapi.v3.executor.service;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchReportingServiceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchReportingServiceExecutor.java
index aed6df1604b..46a0ac3ab9b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchReportingServiceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchReportingServiceExecutor.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.asapi.v3.executor.service;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.service.ReportingService;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchReportingServicesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchReportingServicesOperationExecutor.java
index 90c9cb79a95..3ea722bef9d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchReportingServicesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchReportingServicesOperationExecutor.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.asapi.v3.executor.service;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchSearchDomainServiceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchSearchDomainServiceExecutor.java
index 603b339fd09..1051222ee61 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchSearchDomainServiceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchSearchDomainServiceExecutor.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.asapi.v3.executor.service;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.service.SearchDomainService;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchSearchDomainServicesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchSearchDomainServicesOperationExecutor.java
index 866b729c8c5..601d8581f0b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchSearchDomainServicesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ISearchSearchDomainServicesOperationExecutor.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.asapi.v3.executor.service;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ProcessingServiceAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ProcessingServiceAuthorizationExecutor.java
index ace11b5b96b..b125c1b3775 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ProcessingServiceAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ProcessingServiceAuthorizationExecutor.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.asapi.v3.executor.service;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ReportingServiceAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ReportingServiceAuthorizationExecutor.java
index a994adf6e72..08f8cdb795b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ReportingServiceAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/ReportingServiceAuthorizationExecutor.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.asapi.v3.executor.service;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchAggregationServiceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchAggregationServiceExecutor.java
index 8ab256a2b62..2361bfe9669 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchAggregationServiceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchAggregationServiceExecutor.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.asapi.v3.executor.service;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchAggregationServicesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchAggregationServicesOperationExecutor.java
index e2ef2915b03..db27f36291c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchAggregationServicesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchAggregationServicesOperationExecutor.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.server.asapi.v3.executor.service;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchCustomASServiceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchCustomASServiceExecutor.java
index 364bf3bab76..7196b69612f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchCustomASServiceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchCustomASServiceExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.service;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchCustomASServicesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchCustomASServicesOperationExecutor.java
index 56279bb8b0f..49c67f6e0a3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchCustomASServicesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchCustomASServicesOperationExecutor.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.server.asapi.v3.executor.service;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchDomainServiceAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchDomainServiceAuthorizationExecutor.java
index df7f98abeea..9a05edfd3d9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchDomainServiceAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchDomainServiceAuthorizationExecutor.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.asapi.v3.executor.service;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchProcessingServiceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchProcessingServiceExecutor.java
index bd682d90a92..50c35a66f37 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchProcessingServiceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchProcessingServiceExecutor.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.asapi.v3.executor.service;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchProcessingServicesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchProcessingServicesOperationExecutor.java
index 27664b7d77c..9cc86163887 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchProcessingServicesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchProcessingServicesOperationExecutor.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.server.asapi.v3.executor.service;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchReportingServiceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchReportingServiceExecutor.java
index 63c8a5e231c..fe8a6eff6dc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchReportingServiceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchReportingServiceExecutor.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.asapi.v3.executor.service;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchReportingServicesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchReportingServicesOperationExecutor.java
index 7ec207d3c68..8c4f9d31fbd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchReportingServicesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchReportingServicesOperationExecutor.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.server.asapi.v3.executor.service;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchSearchDomainServiceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchSearchDomainServiceExecutor.java
index 82048660ee0..10cea72c677 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchSearchDomainServiceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchSearchDomainServiceExecutor.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.asapi.v3.executor.service;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchSearchDomainServicesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchSearchDomainServicesOperationExecutor.java
index 77ff49635be..8da0837fca2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchSearchDomainServicesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/service/SearchSearchDomainServicesOperationExecutor.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.server.asapi.v3.executor.service;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/GetSessionInformationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/GetSessionInformationExecutor.java
index 647508e45ec..28b600f0a51 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/GetSessionInformationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/GetSessionInformationExecutor.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.server.asapi.v3.executor.session;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/GetSessionInformationOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/GetSessionInformationOperationExecutor.java
index a18ece32c2a..3e874085816 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/GetSessionInformationOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/GetSessionInformationOperationExecutor.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.server.asapi.v3.executor.session;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/IGetSessionInformationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/IGetSessionInformationExecutor.java
index 935d5796aea..b458935f8e4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/IGetSessionInformationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/IGetSessionInformationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.session;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.session.SessionInformation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/IGetSessionInformationOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/IGetSessionInformationOperationExecutor.java
index 26a715b414b..7c729be1754 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/IGetSessionInformationOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/IGetSessionInformationOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.session;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/ISearchSessionInformationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/ISearchSessionInformationExecutor.java
index 09814e71fff..5f87ae3b8de 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/ISearchSessionInformationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/ISearchSessionInformationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.session;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.session.search.SessionInformationSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/ISearchSessionInformationOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/ISearchSessionInformationOperationExecutor.java
index 460008fe7a4..aa70edd83a5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/ISearchSessionInformationOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/ISearchSessionInformationOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.session;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/ISessionInformationAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/ISessionInformationAuthorizationExecutor.java
index a02be445a7f..f2a7a66636b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/ISessionInformationAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/ISessionInformationAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.session;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/SearchSessionInformationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/SearchSessionInformationExecutor.java
index 4d2a4fd995a..8c55bf4e733 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/SearchSessionInformationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/SearchSessionInformationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.session;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/SearchSessionInformationOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/SearchSessionInformationOperationExecutor.java
index da7177e7fda..1eed2d71b84 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/SearchSessionInformationOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/SearchSessionInformationOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.session;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/SessionInformationAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/SessionInformationAuthorizationExecutor.java
index bfd4bd3516a..50229451fff 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/SessionInformationAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/session/SessionInformationAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.session;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/CreateSpaceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/CreateSpaceExecutor.java
index 644afdf383d..b1ccb170fc4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/CreateSpaceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/CreateSpaceExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.asapi.v3.executor.space;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/CreateSpacesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/CreateSpacesOperationExecutor.java
index bd28871685a..6fa344badc1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/CreateSpacesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/CreateSpacesOperationExecutor.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.server.asapi.v3.executor.space;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/DeleteSpaceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/DeleteSpaceExecutor.java
index 061b112f8cb..c7c47ca422e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/DeleteSpaceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/DeleteSpaceExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.space;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/DeleteSpacesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/DeleteSpacesOperationExecutor.java
index ffffcd34bc1..960ca2598d7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/DeleteSpacesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/DeleteSpacesOperationExecutor.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.server.asapi.v3.executor.space;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/GetSpacesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/GetSpacesOperationExecutor.java
index 2832368b67b..f78839c050e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/GetSpacesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/GetSpacesOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.executor.space;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/ICreateSpaceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/ICreateSpaceExecutor.java
index 5d8832e59f8..a65bac9bfee 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/ICreateSpaceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/ICreateSpaceExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.space;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.create.SpaceCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/ICreateSpacesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/ICreateSpacesOperationExecutor.java
index bc28acfcff3..8a72e14b449 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/ICreateSpacesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/ICreateSpacesOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.space;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.create.ICreateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/IDeleteSpaceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/IDeleteSpaceExecutor.java
index 42bf2a6a83a..c02658fe9de 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/IDeleteSpaceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/IDeleteSpaceExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.space;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.delete.SpaceDeletionOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/IDeleteSpacesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/IDeleteSpacesOperationExecutor.java
index e0c758701dc..74b67f0ab3d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/IDeleteSpacesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/IDeleteSpacesOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.space;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.delete.IDeleteObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/IGetSpacesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/IGetSpacesOperationExecutor.java
index 7ffc621da64..2b24c7de052 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/IGetSpacesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/IGetSpacesOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.space;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/IMapSpaceByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/IMapSpaceByIdExecutor.java
index 57b2469a752..c49cfe94430 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/IMapSpaceByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/IMapSpaceByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.space;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.id.ISpaceId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/IMapSpaceTechIdByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/IMapSpaceTechIdByIdExecutor.java
index 521b69b7315..907683bf32d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/IMapSpaceTechIdByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/IMapSpaceTechIdByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.space;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.id.ISpaceId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/ISearchSpaceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/ISearchSpaceExecutor.java
index f74afa9a49a..2fe38ba9f88 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/ISearchSpaceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/ISearchSpaceExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.space;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.search.SpaceSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/ISearchSpacesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/ISearchSpacesOperationExecutor.java
index 6a4d0bee5d6..fd01fa14af7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/ISearchSpacesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/ISearchSpacesOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.space;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/ISpaceAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/ISpaceAuthorizationExecutor.java
index 891dca7ce13..f6c8a611c31 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/ISpaceAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/ISpaceAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.space;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.id.ISpaceId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/IUpdateSpaceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/IUpdateSpaceExecutor.java
index f9f349a205e..8f846f529bc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/IUpdateSpaceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/IUpdateSpaceExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.space;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.id.SpacePermId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/IUpdateSpacesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/IUpdateSpacesOperationExecutor.java
index 7d9f707bd8b..f8e982526df 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/IUpdateSpacesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/IUpdateSpacesOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.space;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.update.IUpdateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/MapSpaceByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/MapSpaceByIdExecutor.java
index 014e5467be1..167a383ed2e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/MapSpaceByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/MapSpaceByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.space;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.id.ISpaceId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/MapSpaceTechIdByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/MapSpaceTechIdByIdExecutor.java
index 12be0c12fb3..30409d5560b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/MapSpaceTechIdByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/MapSpaceTechIdByIdExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.executor.space;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/SearchSpaceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/SearchSpaceExecutor.java
index 489a008c7ca..83f599b9bf7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/SearchSpaceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/SearchSpaceExecutor.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.asapi.v3.executor.space;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.*;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/SearchSpacesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/SearchSpacesOperationExecutor.java
index b8d281a7504..361c770b1b9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/SearchSpacesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/SearchSpacesOperationExecutor.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.server.asapi.v3.executor.space;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.project.Project;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/SpaceAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/SpaceAuthorizationExecutor.java
index e2a86a2765b..e8790f14bc4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/SpaceAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/SpaceAuthorizationExecutor.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.server.asapi.v3.executor.space;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/UpdateSpaceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/UpdateSpaceExecutor.java
index ecbc8ee20ed..a661470345f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/UpdateSpaceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/UpdateSpaceExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.asapi.v3.executor.space;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/UpdateSpacesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/UpdateSpacesOperationExecutor.java
index d4cadcdfb43..601c8bc25f7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/UpdateSpacesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/UpdateSpacesOperationExecutor.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.server.asapi.v3.executor.space;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/AddTagToEntityExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/AddTagToEntityExecutor.java
index e74f5bbcaa6..ee4b08a6909 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/AddTagToEntityExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/AddTagToEntityExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/CreateMissingTagExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/CreateMissingTagExecutor.java
index b0aa1838228..40323e39335 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/CreateMissingTagExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/CreateMissingTagExecutor.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.server.asapi.v3.executor.tag;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/CreateTagExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/CreateTagExecutor.java
index 531176aecbe..4caa7d63ba2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/CreateTagExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/CreateTagExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/CreateTagsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/CreateTagsOperationExecutor.java
index a15a8066e9b..44e662f4fd7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/CreateTagsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/CreateTagsOperationExecutor.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.server.asapi.v3.executor.tag;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/DeleteTagExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/DeleteTagExecutor.java
index 037b7ee1975..d7b7f7052e8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/DeleteTagExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/DeleteTagExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.tag;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/DeleteTagsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/DeleteTagsOperationExecutor.java
index 17c860f3384..72bab361b75 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/DeleteTagsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/DeleteTagsOperationExecutor.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.server.asapi.v3.executor.tag;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/GetTagIdentifierExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/GetTagIdentifierExecutor.java
index eef7588a191..f9252fafbae 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/GetTagIdentifierExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/GetTagIdentifierExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/GetTagsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/GetTagsOperationExecutor.java
index 8495dbc8dfb..c07b68116c4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/GetTagsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/GetTagsOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.asapi.v3.executor.tag;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IAddTagToEntityExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IAddTagToEntityExecutor.java
index 8a15fe2385d..8f88cdbddbd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IAddTagToEntityExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IAddTagToEntityExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ICreateMissingTagExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ICreateMissingTagExecutor.java
index 3f947b9393e..2a0744d8950 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ICreateMissingTagExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ICreateMissingTagExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ICreateTagExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ICreateTagExecutor.java
index a0f2515ea0c..30c2bad56a8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ICreateTagExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ICreateTagExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.create.TagCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ICreateTagsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ICreateTagsOperationExecutor.java
index 554f5676e7e..a87a7d94a08 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ICreateTagsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ICreateTagsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.create.ICreateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IDeleteTagExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IDeleteTagExecutor.java
index a21ed73f229..fd2a7ae1af0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IDeleteTagExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IDeleteTagExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.delete.TagDeletionOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IDeleteTagsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IDeleteTagsOperationExecutor.java
index 0d306a87cf7..fcb2be4ab44 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IDeleteTagsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IDeleteTagsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.delete.IDeleteObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IGetTagIdentifierExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IGetTagIdentifierExecutor.java
index 332dada8175..f28b3837552 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IGetTagIdentifierExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IGetTagIdentifierExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.id.ITagId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IGetTagsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IGetTagsOperationExecutor.java
index e9a9fe0b017..38cfd3b5086 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IGetTagsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IGetTagsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IMapTagByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IMapTagByIdExecutor.java
index 784a2936b7f..5eb1a0f1adf 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IMapTagByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IMapTagByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.id.ITagId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IRemoveTagFromEntityExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IRemoveTagFromEntityExecutor.java
index 24eec1cd9f4..f78cba0a91f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IRemoveTagFromEntityExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IRemoveTagFromEntityExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ISearchTagExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ISearchTagExecutor.java
index baa32771a84..7c7a0462064 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ISearchTagExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ISearchTagExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.search.TagSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ISearchTagsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ISearchTagsOperationExecutor.java
index 1649e97f03c..711110ff359 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ISearchTagsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ISearchTagsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ISetTagDataSetsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ISetTagDataSetsExecutor.java
index 85d63b71a38..66cdcbebf5c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ISetTagDataSetsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ISetTagDataSetsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.create.TagCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ISetTagExperimentsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ISetTagExperimentsExecutor.java
index c9def06cbef..677ad7211ee 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ISetTagExperimentsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ISetTagExperimentsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.create.TagCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ISetTagForEntityExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ISetTagForEntityExecutor.java
index 8b013afa2bd..1f774f0a68b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ISetTagForEntityExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ISetTagForEntityExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ISetTagMaterialsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ISetTagMaterialsExecutor.java
index d37ebe06251..187f1d8a41b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ISetTagMaterialsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ISetTagMaterialsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.create.TagCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ISetTagSamplesExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ISetTagSamplesExecutor.java
index 4885b4a0e84..898ba251d23 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ISetTagSamplesExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ISetTagSamplesExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.create.TagCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ITagAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ITagAuthorizationExecutor.java
index af678710897..92d49856f36 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ITagAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ITagAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.id.ITagId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagDataSetsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagDataSetsExecutor.java
index 1caf893b9d2..cc1925a1f06 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagDataSetsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagDataSetsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.update.TagUpdate;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagDataSetsWithCacheExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagDataSetsWithCacheExecutor.java
index f8e9f81f1ee..5f03325de04 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagDataSetsWithCacheExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagDataSetsWithCacheExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id.IDataSetId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagExecutor.java
index 8bbbfe6aa2d..0c65d39591a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.id.TagPermId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagExperimentsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagExperimentsExecutor.java
index 09afc6d589a..88ddbf6a962 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagExperimentsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagExperimentsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.update.TagUpdate;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagExperimentsWithCacheExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagExperimentsWithCacheExecutor.java
index d5c75556a79..48893b4b56f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagExperimentsWithCacheExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagExperimentsWithCacheExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.id.IExperimentId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagForEntityExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagForEntityExecutor.java
index 1b3acb1f4de..9cb02a7014d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagForEntityExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagForEntityExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.update.IdListUpdateValue;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagMaterialsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagMaterialsExecutor.java
index 41c3b2ea0fe..b407f023af7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagMaterialsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagMaterialsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.update.TagUpdate;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagMaterialsWithCacheExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagMaterialsWithCacheExecutor.java
index 7627be2ae83..2a7079fce24 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagMaterialsWithCacheExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagMaterialsWithCacheExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.id.IMaterialId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagSamplesExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagSamplesExecutor.java
index 6fecbcc4ef7..4f5cf507b76 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagSamplesExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagSamplesExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.update.TagUpdate;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagSamplesWithCacheExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagSamplesWithCacheExecutor.java
index 70a0906fa18..2d216e299aa 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagSamplesWithCacheExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagSamplesWithCacheExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.id.ISampleId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagsOperationExecutor.java
index 936d9562a83..9e438636ee7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/IUpdateTagsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.update.IUpdateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/MapTagByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/MapTagByIdExecutor.java
index 69cf74a4623..1cfd4930c81 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/MapTagByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/MapTagByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/RemoveTagFromEntityExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/RemoveTagFromEntityExecutor.java
index fd45e697882..bcfec547568 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/RemoveTagFromEntityExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/RemoveTagFromEntityExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SearchTagExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SearchTagExecutor.java
index 956af90342b..0c41bee11d0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SearchTagExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SearchTagExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.tag;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SearchTagsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SearchTagsOperationExecutor.java
index ccef901de38..ce246daaa31 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SearchTagsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SearchTagsOperationExecutor.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.server.asapi.v3.executor.tag;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SetTagDataSetsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SetTagDataSetsExecutor.java
index 2e3b62f5263..f1ced28cb48 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SetTagDataSetsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SetTagDataSetsExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.asapi.v3.executor.tag;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SetTagEntitiesExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SetTagEntitiesExecutor.java
index 39933b646b7..41839676c58 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SetTagEntitiesExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SetTagEntitiesExecutor.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.server.asapi.v3.executor.tag;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SetTagExperimentsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SetTagExperimentsExecutor.java
index 49e2b123865..368af60bf3c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SetTagExperimentsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SetTagExperimentsExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.asapi.v3.executor.tag;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SetTagForEntityExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SetTagForEntityExecutor.java
index f59a035394d..3f1bb333385 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SetTagForEntityExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SetTagForEntityExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SetTagMaterialsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SetTagMaterialsExecutor.java
index 2d45e952467..23438093422 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SetTagMaterialsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SetTagMaterialsExecutor.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.server.asapi.v3.executor.tag;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SetTagSamplesExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SetTagSamplesExecutor.java
index e6039afc87b..763e88084b9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SetTagSamplesExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/SetTagSamplesExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/TagAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/TagAuthorizationExecutor.java
index 3628d5ef003..776ebd49aa1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/TagAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/TagAuthorizationExecutor.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.server.asapi.v3.executor.tag;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagDataSetsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagDataSetsExecutor.java
index 2fa2b13bf9b..6e646836690 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagDataSetsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagDataSetsExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.server.asapi.v3.executor.tag;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagDataSetsWithCacheExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagDataSetsWithCacheExecutor.java
index a36cb53b575..e405339a6d0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagDataSetsWithCacheExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagDataSetsWithCacheExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.asapi.v3.executor.tag;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagEntitiesWithCacheExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagEntitiesWithCacheExecutor.java
index 67b62520376..46dfba8572a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagEntitiesWithCacheExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagEntitiesWithCacheExecutor.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.server.asapi.v3.executor.tag;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagExecutor.java
index 75d62c4ea40..2e1bfdd7c3b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.server.asapi.v3.executor.tag;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagExperimentsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagExperimentsExecutor.java
index 32d57941642..05a3c4e5f73 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagExperimentsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagExperimentsExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagExperimentsWithCacheExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagExperimentsWithCacheExecutor.java
index 082cfb5c455..1d2df69dd4d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagExperimentsWithCacheExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagExperimentsWithCacheExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.server.asapi.v3.executor.tag;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagForEntityExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagForEntityExecutor.java
index da2e9e9c0d2..3e057125999 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagForEntityExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagForEntityExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagMaterialsExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagMaterialsExecutor.java
index f79e17c2887..85021d4cc24 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagMaterialsExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagMaterialsExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.server.asapi.v3.executor.tag;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagMaterialsWithCacheExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagMaterialsWithCacheExecutor.java
index 1da48c89553..454f55efe73 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagMaterialsWithCacheExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagMaterialsWithCacheExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.server.asapi.v3.executor.tag;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagSamplesExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagSamplesExecutor.java
index 437904a2382..9cef256e4f8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagSamplesExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagSamplesExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.asapi.v3.executor.tag;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagSamplesWithCacheExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagSamplesWithCacheExecutor.java
index f5518010e38..de84e7bb717 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagSamplesWithCacheExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagSamplesWithCacheExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagsOperationExecutor.java
index ee76a4b7f2e..046b10e75f1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagsOperationExecutor.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.server.asapi.v3.executor.tag;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/CreateVocabulariesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/CreateVocabulariesOperationExecutor.java
index f45656aafe7..26a0cbe0b78 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/CreateVocabulariesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/CreateVocabulariesOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2023 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in 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.asapi.v3.executor.vocabulary;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/CreateVocabularyExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/CreateVocabularyExecutor.java
index 9e4eac9f6d0..5f91cdbdd63 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/CreateVocabularyExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/CreateVocabularyExecutor.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.asapi.v3.executor.vocabulary;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/CreateVocabularyTermExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/CreateVocabularyTermExecutor.java
index 148dd43f547..d39c9df870d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/CreateVocabularyTermExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/CreateVocabularyTermExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.server.asapi.v3.executor.vocabulary;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/CreateVocabularyTermsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/CreateVocabularyTermsOperationExecutor.java
index 50d1b079ba8..cd7acfcf1fa 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/CreateVocabularyTermsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/CreateVocabularyTermsOperationExecutor.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.server.asapi.v3.executor.vocabulary;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/DeleteVocabulariesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/DeleteVocabulariesOperationExecutor.java
index 73b87ab1571..5ef409b2a81 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/DeleteVocabulariesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/DeleteVocabulariesOperationExecutor.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.server.asapi.v3.executor.vocabulary;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/DeleteVocabularyExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/DeleteVocabularyExecutor.java
index 9732d73a035..be0afccfa89 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/DeleteVocabularyExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/DeleteVocabularyExecutor.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.asapi.v3.executor.vocabulary;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/DeleteVocabularyTermExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/DeleteVocabularyTermExecutor.java
index 8bc35db8a53..667364f4a4a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/DeleteVocabularyTermExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/DeleteVocabularyTermExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.vocabulary;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/DeleteVocabularyTermsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/DeleteVocabularyTermsOperationExecutor.java
index 23fd57138fe..3d0530e6ead 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/DeleteVocabularyTermsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/DeleteVocabularyTermsOperationExecutor.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.server.asapi.v3.executor.vocabulary;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/GetVocabulariesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/GetVocabulariesOperationExecutor.java
index bf334b5297e..a6a29f056e8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/GetVocabulariesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/GetVocabulariesOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2023 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in 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.asapi.v3.executor.vocabulary;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/GetVocabularyTermsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/GetVocabularyTermsOperationExecutor.java
index 25571264c7e..642af643d73 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/GetVocabularyTermsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/GetVocabularyTermsOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.asapi.v3.executor.vocabulary;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ICreateVocabulariesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ICreateVocabulariesOperationExecutor.java
index bbf87c758d8..9c5b227b04c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ICreateVocabulariesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ICreateVocabulariesOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2023 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in 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.asapi.v3.executor.vocabulary;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ICreateVocabularyExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ICreateVocabularyExecutor.java
index afebb95a0e9..85fab005ae2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ICreateVocabularyExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ICreateVocabularyExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2023 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in 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.asapi.v3.executor.vocabulary;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.create.VocabularyCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ICreateVocabularyTermExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ICreateVocabularyTermExecutor.java
index 31cb8311c9a..37de1a57c7c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ICreateVocabularyTermExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ICreateVocabularyTermExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.vocabulary;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.create.VocabularyTermCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ICreateVocabularyTermsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ICreateVocabularyTermsOperationExecutor.java
index 2ad003cf7b4..fee0153eafa 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ICreateVocabularyTermsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ICreateVocabularyTermsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.vocabulary;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.create.ICreateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IDeleteVocabulariesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IDeleteVocabulariesOperationExecutor.java
index ec677831564..ad1cc1b17c3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IDeleteVocabulariesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IDeleteVocabulariesOperationExecutor.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.asapi.v3.executor.vocabulary;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.delete.IDeleteObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IDeleteVocabularyExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IDeleteVocabularyExecutor.java
index f6d537b33ca..5c453ecd237 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IDeleteVocabularyExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IDeleteVocabularyExecutor.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.asapi.v3.executor.vocabulary;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.delete.VocabularyDeletionOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IDeleteVocabularyTermExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IDeleteVocabularyTermExecutor.java
index f4bccb2ba7e..810c8bff1cf 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IDeleteVocabularyTermExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IDeleteVocabularyTermExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.vocabulary;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.delete.VocabularyTermDeletionOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IDeleteVocabularyTermsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IDeleteVocabularyTermsOperationExecutor.java
index 54c45c608c0..ae850b7f007 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IDeleteVocabularyTermsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IDeleteVocabularyTermsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.vocabulary;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.delete.IDeleteObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IGetVocabulariesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IGetVocabulariesOperationExecutor.java
index a4a26c21d7f..0e3186f8852 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IGetVocabulariesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IGetVocabulariesOperationExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2023 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in 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.asapi.v3.executor.vocabulary;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IGetVocabularyTermsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IGetVocabularyTermsOperationExecutor.java
index 2eb8e236c75..ad342c1ebfe 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IGetVocabularyTermsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IGetVocabularyTermsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.vocabulary;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.IOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IMapVocabularyByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IMapVocabularyByIdExecutor.java
index 812dc84698e..e0a07c65e86 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IMapVocabularyByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IMapVocabularyByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.vocabulary;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.id.IVocabularyId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IMapVocabularyTermByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IMapVocabularyTermByIdExecutor.java
index d02342a800f..c05c78e0a06 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IMapVocabularyTermByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IMapVocabularyTermByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.vocabulary;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.id.IVocabularyTermId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ISearchVocabulariesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ISearchVocabulariesOperationExecutor.java
index 7189f1526df..79896f0da4b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ISearchVocabulariesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ISearchVocabulariesOperationExecutor.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.asapi.v3.executor.vocabulary;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ISearchVocabularyExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ISearchVocabularyExecutor.java
index c8c8c82fb90..f2350362df5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ISearchVocabularyExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ISearchVocabularyExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.vocabulary;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.search.VocabularySearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ISearchVocabularyTermExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ISearchVocabularyTermExecutor.java
index c9ea3bc2fda..6385aca4429 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ISearchVocabularyTermExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ISearchVocabularyTermExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.vocabulary;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.search.VocabularyTermSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ISearchVocabularyTermsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ISearchVocabularyTermsOperationExecutor.java
index 6fa7025529f..a9910711bd8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ISearchVocabularyTermsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/ISearchVocabularyTermsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.vocabulary;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.search.ISearchObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IUpdateVocabulariesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IUpdateVocabulariesOperationExecutor.java
index dbfdc19baa8..69762ee088d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IUpdateVocabulariesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IUpdateVocabulariesOperationExecutor.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.asapi.v3.executor.vocabulary;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.update.IUpdateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IUpdateVocabularyExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IUpdateVocabularyExecutor.java
index a8b6e34a850..23822fc3b61 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IUpdateVocabularyExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IUpdateVocabularyExecutor.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.asapi.v3.executor.vocabulary;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.id.VocabularyPermId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IUpdateVocabularyTermExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IUpdateVocabularyTermExecutor.java
index 68546ed8220..c2f74500c94 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IUpdateVocabularyTermExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IUpdateVocabularyTermExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.vocabulary;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.id.VocabularyTermPermId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IUpdateVocabularyTermsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IUpdateVocabularyTermsOperationExecutor.java
index 8b4f586a470..deddb449802 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IUpdateVocabularyTermsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IUpdateVocabularyTermsOperationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.vocabulary;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.common.update.IUpdateObjectsOperationExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IVocabularyAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IVocabularyAuthorizationExecutor.java
index d5f068546d2..8ddc5dab6f3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IVocabularyAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IVocabularyAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.vocabulary;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.id.IVocabularyId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IVocabularyTermAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IVocabularyTermAuthorizationExecutor.java
index 3c222bee3ae..65799bf906e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IVocabularyTermAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/IVocabularyTermAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.vocabulary;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/MapVocabularyByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/MapVocabularyByIdExecutor.java
index b0e1429a2fb..d82a4b2f4fa 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/MapVocabularyByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/MapVocabularyByIdExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.vocabulary;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/MapVocabularyTermByIdExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/MapVocabularyTermByIdExecutor.java
index 4f3b5bd4a1d..615a23c39fd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/MapVocabularyTermByIdExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/MapVocabularyTermByIdExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.vocabulary;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/SearchVocabulariesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/SearchVocabulariesOperationExecutor.java
index 8833761a77c..e5b12f2b4bd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/SearchVocabulariesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/SearchVocabulariesOperationExecutor.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.server.asapi.v3.executor.vocabulary;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.search.planner.ILocalSearchManager;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/SearchVocabularyExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/SearchVocabularyExecutor.java
index 15219314716..8b19161dc13 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/SearchVocabularyExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/SearchVocabularyExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.vocabulary;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/SearchVocabularyTermExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/SearchVocabularyTermExecutor.java
index 2c9f546dfe2..b9a0c3d7d2d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/SearchVocabularyTermExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/SearchVocabularyTermExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.executor.vocabulary;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/SearchVocabularyTermsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/SearchVocabularyTermsOperationExecutor.java
index 556488d7470..264c9cdfbdf 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/SearchVocabularyTermsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/SearchVocabularyTermsOperationExecutor.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.server.asapi.v3.executor.vocabulary;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.search.planner.ILocalSearchManager;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/UpdateVocabulariesOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/UpdateVocabulariesOperationExecutor.java
index e635fda4fa1..4f0e09ec569 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/UpdateVocabulariesOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/UpdateVocabulariesOperationExecutor.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.server.asapi.v3.executor.vocabulary;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/UpdateVocabularyExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/UpdateVocabularyExecutor.java
index d3a3b5e8fa2..c8ec36342e6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/UpdateVocabularyExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/UpdateVocabularyExecutor.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.asapi.v3.executor.vocabulary;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/UpdateVocabularyTermExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/UpdateVocabularyTermExecutor.java
index 05418fbd024..ce0e66536ed 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/UpdateVocabularyTermExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/UpdateVocabularyTermExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.server.asapi.v3.executor.vocabulary;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/UpdateVocabularyTermsOperationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/UpdateVocabularyTermsOperationExecutor.java
index 4b105bf05b4..ba26889718e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/UpdateVocabularyTermsOperationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/UpdateVocabularyTermsOperationExecutor.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.server.asapi.v3.executor.vocabulary;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/VocabularyAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/VocabularyAuthorizationExecutor.java
index abdf9f0dfb6..8723e718332 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/VocabularyAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/VocabularyAuthorizationExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.executor.vocabulary;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/VocabularyTermAuthorizationExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/VocabularyTermAuthorizationExecutor.java
index d42a67f5f46..31a10e50b68 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/VocabularyTermAuthorizationExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/vocabulary/VocabularyTermAuthorizationExecutor.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.server.asapi.v3.executor.vocabulary;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/authorizationgroup/AuthorizationGroupComparatorFactory.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/authorizationgroup/AuthorizationGroupComparatorFactory.java
index 67a721fe9ff..9e9c0a69c07 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/authorizationgroup/AuthorizationGroupComparatorFactory.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/authorizationgroup/AuthorizationGroupComparatorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 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.ethz.sis.openbis.generic.server.asapi.v3.helper.authorizationgroup;
 
 import java.util.Comparator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/authorizationgroup/AuthorizationGroupQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/authorizationgroup/AuthorizationGroupQuery.java
index b0979ff7021..a3dc291e3fa 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/authorizationgroup/AuthorizationGroupQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/authorizationgroup/AuthorizationGroupQuery.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.asapi.v3.helper.authorizationgroup;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/authorizationgroup/ListAuthorizationGroupByPermId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/authorizationgroup/ListAuthorizationGroupByPermId.java
index d24196854d4..4798926e6be 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/authorizationgroup/ListAuthorizationGroupByPermId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/authorizationgroup/ListAuthorizationGroupByPermId.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.asapi.v3.helper.authorizationgroup;
 
 import java.util.LinkedHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/authorizationgroup/ListAuthorizationGroupTechIdByPermId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/authorizationgroup/ListAuthorizationGroupTechIdByPermId.java
index c63005970b5..f606d0a84c2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/authorizationgroup/ListAuthorizationGroupTechIdByPermId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/authorizationgroup/ListAuthorizationGroupTechIdByPermId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 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.ethz.sis.openbis.generic.server.asapi.v3.helper.authorizationgroup;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/AbstractListObjectById.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/AbstractListObjectById.java
index a17989ba46f..29f2054fcfa 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/AbstractListObjectById.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/AbstractListObjectById.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.ethz.sis.openbis.generic.server.asapi.v3.helper.common;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/AbstractListTechIdById.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/AbstractListTechIdById.java
index 5a2c2936f62..56c03159780 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/AbstractListTechIdById.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/AbstractListTechIdById.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.ethz.sis.openbis.generic.server.asapi.v3.helper.common;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/AbstractListTechIdByPermId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/AbstractListTechIdByPermId.java
index e6b4c45dc91..fd5ec5f7aca 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/AbstractListTechIdByPermId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/AbstractListTechIdByPermId.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.ethz.sis.openbis.generic.server.asapi.v3.helper.common;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/CommonUtils.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/CommonUtils.java
index 7f84ba716ec..09385f86f8b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/CommonUtils.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/CommonUtils.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.asapi.v3.helper.common;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/CreationIdCache.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/CreationIdCache.java
index 5086b209c56..67453d750e9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/CreationIdCache.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/CreationIdCache.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.server.asapi.v3.helper.common;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/FreezingEvent.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/FreezingEvent.java
index c2982202525..bfd77269741 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/FreezingEvent.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/FreezingEvent.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.asapi.v3.helper.common;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.EventPE;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/FreezingFlags.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/FreezingFlags.java
index daee5b5a2b4..79ab003af8d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/FreezingFlags.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/FreezingFlags.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.asapi.v3.helper.common;
 
 import java.util.Set;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/IListObjectById.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/IListObjectById.java
index e5a673e101e..32aeb1b4074 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/IListObjectById.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/IListObjectById.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.helper.common;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/MapObjectById.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/MapObjectById.java
index 84d6e5498ab..8c53b02156e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/MapObjectById.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/MapObjectById.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.ethz.sis.openbis.generic.server.asapi.v3.helper.common;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/TechIdStringIdentifierRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/TechIdStringIdentifierRecord.java
index 461e95aea3f..cbda7ad4086 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/TechIdStringIdentifierRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/TechIdStringIdentifierRecord.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.ethz.sis.openbis.generic.server.asapi.v3.helper.common;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/batch/Batch.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/batch/Batch.java
index 0c022950181..d724bd26921 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/batch/Batch.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/batch/Batch.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.server.asapi.v3.helper.common.batch;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/batch/CollectionBatch.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/batch/CollectionBatch.java
index 300dd5a2296..71933facd5f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/batch/CollectionBatch.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/batch/CollectionBatch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.helper.common.batch;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/batch/CollectionBatchProcessor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/batch/CollectionBatchProcessor.java
index 869e3f207a1..d39be999b88 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/batch/CollectionBatchProcessor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/batch/CollectionBatchProcessor.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.server.asapi.v3.helper.common.batch;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.context.IProgress;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/batch/MapBatch.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/batch/MapBatch.java
index 1031ca4d5bb..8bb79188f5e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/batch/MapBatch.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/batch/MapBatch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.helper.common.batch;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/batch/MapBatchProcessor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/batch/MapBatchProcessor.java
index 774e5a5cccf..84a668c227b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/batch/MapBatchProcessor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/common/batch/MapBatchProcessor.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.server.asapi.v3.helper.common.batch;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/dataset/DataSetComparatorFactory.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/dataset/DataSetComparatorFactory.java
index 4c70bba2a49..83e52f3a51f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/dataset/DataSetComparatorFactory.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/dataset/DataSetComparatorFactory.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.ethz.sis.openbis.generic.server.asapi.v3.helper.dataset;
 
 import java.util.Comparator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/dataset/DataSetQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/dataset/DataSetQuery.java
index 5e81df9d16f..a1706778dbc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/dataset/DataSetQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/dataset/DataSetQuery.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.ethz.sis.openbis.generic.server.asapi.v3.helper.dataset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/dataset/ListDataSetByPermId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/dataset/ListDataSetByPermId.java
index 0becc8a6ee1..b898e27c600 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/dataset/ListDataSetByPermId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/dataset/ListDataSetByPermId.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.ethz.sis.openbis.generic.server.asapi.v3.helper.dataset;
 
 import java.util.HashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/dataset/ListDataSetTechIdByPermId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/dataset/ListDataSetTechIdByPermId.java
index 88fa9832b67..961ff57fa0a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/dataset/ListDataSetTechIdByPermId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/dataset/ListDataSetTechIdByPermId.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.asapi.v3.helper.dataset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/dataset/ListFileFormatTypeByPermId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/dataset/ListFileFormatTypeByPermId.java
index 320246e5fb4..2e80ed99062 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/dataset/ListFileFormatTypeByPermId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/dataset/ListFileFormatTypeByPermId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 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.asapi.v3.helper.dataset;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/dataset/ListLocatorTypeByPermId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/dataset/ListLocatorTypeByPermId.java
index 1c923786f48..c55042717ba 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/dataset/ListLocatorTypeByPermId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/dataset/ListLocatorTypeByPermId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 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.asapi.v3.helper.dataset;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/datastore/ListDataStoreByPermId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/datastore/ListDataStoreByPermId.java
index 5421c9b0752..6e1e4762d1a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/datastore/ListDataStoreByPermId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/datastore/ListDataStoreByPermId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 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.asapi.v3.helper.datastore;
 
 import java.util.LinkedList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/deletion/ListDeletionByTechId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/deletion/ListDeletionByTechId.java
index 631a96ebd30..d5f1e576e63 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/deletion/ListDeletionByTechId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/deletion/ListDeletionByTechId.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.ethz.sis.openbis.generic.server.asapi.v3.helper.deletion;
 
 import java.util.LinkedList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/EntityKindConverter.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/EntityKindConverter.java
index 1e6d593b821..3d8187475ab 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/EntityKindConverter.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/EntityKindConverter.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.ethz.sis.openbis.generic.server.asapi.v3.helper.entity;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.EntityKind;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/EntityTypeUtils.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/EntityTypeUtils.java
index 7e988389b87..3928f0724e9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/EntityTypeUtils.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/EntityTypeUtils.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.asapi.v3.helper.entity;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/ListEntityTypeByPermId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/ListEntityTypeByPermId.java
index 747ee8d16e2..eae271ff323 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/ListEntityTypeByPermId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/ListEntityTypeByPermId.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.ethz.sis.openbis.generic.server.asapi.v3.helper.entity;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/CheckAccessProgress.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/CheckAccessProgress.java
index 9e3da1098a8..33eacaf40ef 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/CheckAccessProgress.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/CheckAccessProgress.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.ethz.sis.openbis.generic.server.asapi.v3.helper.entity.progress;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.create.ICreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/CheckDataProgress.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/CheckDataProgress.java
index ec1f40d5a54..84daa8a9eae 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/CheckDataProgress.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/CheckDataProgress.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.ethz.sis.openbis.generic.server.asapi.v3.helper.entity.progress;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.create.ICreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/CreateProgress.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/CreateProgress.java
index 5fa04560d49..555b3c11399 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/CreateProgress.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/CreateProgress.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.ethz.sis.openbis.generic.server.asapi.v3.helper.entity.progress;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.create.ICreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/EntityProgress.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/EntityProgress.java
index 5301b3a27ce..05666c05e89 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/EntityProgress.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/EntityProgress.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.server.asapi.v3.helper.entity.progress;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.context.Progress;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/SetRelationProgress.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/SetRelationProgress.java
index dab31e2fb45..07de5fd2189 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/SetRelationProgress.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/SetRelationProgress.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.ethz.sis.openbis.generic.server.asapi.v3.helper.entity.progress;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.create.ICreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/UpdatePropertyProgress.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/UpdatePropertyProgress.java
index 902075a5b06..1499bf5cc88 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/UpdatePropertyProgress.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/UpdatePropertyProgress.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.ethz.sis.openbis.generic.server.asapi.v3.helper.entity.progress;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/UpdateRelationProgress.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/UpdateRelationProgress.java
index 188398421a0..dca5f33bb79 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/UpdateRelationProgress.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/UpdateRelationProgress.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.ethz.sis.openbis.generic.server.asapi.v3.helper.entity.progress;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.update.IUpdate;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/VerifyProgress.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/VerifyProgress.java
index 058b5254cd4..6e54957fe70 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/VerifyProgress.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/entity/progress/VerifyProgress.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.ethz.sis.openbis.generic.server.asapi.v3.helper.entity.progress;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.IIdentityHolder;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/experiment/ExperimentComparatorFactory.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/experiment/ExperimentComparatorFactory.java
index 5ef251a3136..b5e25cdcea0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/experiment/ExperimentComparatorFactory.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/experiment/ExperimentComparatorFactory.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.server.asapi.v3.helper.experiment;
 
 import java.util.Comparator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/experiment/ExperimentContextDescription.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/experiment/ExperimentContextDescription.java
index 34bdec5dd89..8615e3e728c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/experiment/ExperimentContextDescription.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/experiment/ExperimentContextDescription.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.ethz.sis.openbis.generic.server.asapi.v3.helper.experiment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.create.ExperimentCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/experiment/ListExperimentByIdentifier.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/experiment/ListExperimentByIdentifier.java
index 973734860d3..939f68d1d72 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/experiment/ListExperimentByIdentifier.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/experiment/ListExperimentByIdentifier.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.ethz.sis.openbis.generic.server.asapi.v3.helper.experiment;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/experiment/ListExperimentByPermId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/experiment/ListExperimentByPermId.java
index e3a685bbce6..f2f7d19c625 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/experiment/ListExperimentByPermId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/experiment/ListExperimentByPermId.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.ethz.sis.openbis.generic.server.asapi.v3.helper.experiment;
 
 import java.util.LinkedList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/externaldms/ExternalDmsQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/externaldms/ExternalDmsQuery.java
index d8119156b9f..71b3675108d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/externaldms/ExternalDmsQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/externaldms/ExternalDmsQuery.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.ethz.sis.openbis.generic.server.asapi.v3.helper.externaldms;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/externaldms/ListExternalDmsByPermId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/externaldms/ListExternalDmsByPermId.java
index 98ba7a0c28a..21866572d7f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/externaldms/ListExternalDmsByPermId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/externaldms/ListExternalDmsByPermId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 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.asapi.v3.helper.externaldms;
 
 import java.util.LinkedList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/externaldms/ListExternalDmsTechIdByPermId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/externaldms/ListExternalDmsTechIdByPermId.java
index ab222780fc2..3680d08d438 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/externaldms/ListExternalDmsTechIdByPermId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/externaldms/ListExternalDmsTechIdByPermId.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.ethz.sis.openbis.generic.server.asapi.v3.helper.externaldms;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/AbstractGenerator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/AbstractGenerator.java
index 6d602edaf2e..548a02937f0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/AbstractGenerator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/AbstractGenerator.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.ethz.sis.openbis.generic.server.asapi.v3.helper.generators;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/DtoGenerator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/DtoGenerator.java
index 4fcafb925fe..af5e934c8d0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/DtoGenerator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/DtoGenerator.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.ethz.sis.openbis.generic.server.asapi.v3.helper.generators;
 
 import java.io.FileNotFoundException;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/Generator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/Generator.java
index 947c170a965..14d59dc241b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/Generator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/Generator.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.ethz.sis.openbis.generic.server.asapi.v3.helper.generators;
 
 import java.io.FileNotFoundException;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/UltimateJSEntityGenerator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/UltimateJSEntityGenerator.java
index 675df6774b6..9a47bc7a46f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/UltimateJSEntityGenerator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/UltimateJSEntityGenerator.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.ethz.sis.openbis.generic.server.asapi.v3.helper.generators;
 
 import java.io.BufferedReader;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/uglify/ECMAScriptEngineFactory.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/uglify/ECMAScriptEngineFactory.java
index 9054480007b..f8747651da3 100755
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/uglify/ECMAScriptEngineFactory.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/uglify/ECMAScriptEngineFactory.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.ethz.sis.openbis.generic.server.asapi.v3.helper.generators.uglify;
 
 import javax.script.ScriptEngine;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/uglify/UglifyJS.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/uglify/UglifyJS.java
index 217f6724450..a94541b71f4 100755
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/uglify/UglifyJS.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/uglify/UglifyJS.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.ethz.sis.openbis.generic.server.asapi.v3.helper.generators.uglify;
 
 import java.io.InputStreamReader;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/uglify/UglifyOptions.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/uglify/UglifyOptions.java
index c7c9bb5bc08..1bb205af3f2 100755
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/uglify/UglifyOptions.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/uglify/UglifyOptions.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.ethz.sis.openbis.generic.server.asapi.v3.helper.generators.uglify;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/globalsearch/GlobalSearchObjectComparatorFactory.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/globalsearch/GlobalSearchObjectComparatorFactory.java
index 51d0e92d347..4565b818254 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/globalsearch/GlobalSearchObjectComparatorFactory.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/globalsearch/GlobalSearchObjectComparatorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.server.asapi.v3.helper.globalsearch;
 
 import java.util.Collections;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/globalsearch/ObjectIdentifierComparator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/globalsearch/ObjectIdentifierComparator.java
index 8a2665817c6..0e94606d9a9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/globalsearch/ObjectIdentifierComparator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/globalsearch/ObjectIdentifierComparator.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.ethz.sis.openbis.generic.server.asapi.v3.helper.globalsearch;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.global.GlobalSearchObject;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/globalsearch/ObjectKindComparator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/globalsearch/ObjectKindComparator.java
index 5b6316d2155..e5a7047783b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/globalsearch/ObjectKindComparator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/globalsearch/ObjectKindComparator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.server.asapi.v3.helper.globalsearch;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.global.GlobalSearchObject;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/globalsearch/ObjectPermIdComparator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/globalsearch/ObjectPermIdComparator.java
index fe6211dc742..567ff1c0ef5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/globalsearch/ObjectPermIdComparator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/globalsearch/ObjectPermIdComparator.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.ethz.sis.openbis.generic.server.asapi.v3.helper.globalsearch;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.global.GlobalSearchObject;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/globalsearch/ScoreComparator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/globalsearch/ScoreComparator.java
index 0a63d52b6fb..2df33be2685 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/globalsearch/ScoreComparator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/globalsearch/ScoreComparator.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.ethz.sis.openbis.generic.server.asapi.v3.helper.globalsearch;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.global.GlobalSearchObject;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/material/ListMaterialsByPermId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/material/ListMaterialsByPermId.java
index e93232fd35f..41d59bd7cab 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/material/ListMaterialsByPermId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/material/ListMaterialsByPermId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 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.asapi.v3.helper.material;
 
 import java.util.HashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/material/ListMaterialsTechIdByPermId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/material/ListMaterialsTechIdByPermId.java
index 58aad99b855..c7574bcc28d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/material/ListMaterialsTechIdByPermId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/material/ListMaterialsTechIdByPermId.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.ethz.sis.openbis.generic.server.asapi.v3.helper.material;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/material/MaterialComparatorFactory.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/material/MaterialComparatorFactory.java
index 53a74f33684..653c63a592d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/material/MaterialComparatorFactory.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/material/MaterialComparatorFactory.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.ethz.sis.openbis.generic.server.asapi.v3.helper.material;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.Material;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/material/MaterialQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/material/MaterialQuery.java
index 2693d4bddb8..06e610fd4b6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/material/MaterialQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/material/MaterialQuery.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.ethz.sis.openbis.generic.server.asapi.v3.helper.material;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/pat/ListPersonalAccessTokenByPermId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/pat/ListPersonalAccessTokenByPermId.java
index 4ad1a662d34..8b9ef4831c8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/pat/ListPersonalAccessTokenByPermId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/pat/ListPersonalAccessTokenByPermId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 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.ethz.sis.openbis.generic.server.asapi.v3.helper.pat;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/person/ListPersonByMe.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/person/ListPersonByMe.java
index db8f4c69359..1e14a7317a0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/person/ListPersonByMe.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/person/ListPersonByMe.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 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.ethz.sis.openbis.generic.server.asapi.v3.helper.person;
 
 import java.util.Collections;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/person/ListPersonByPermId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/person/ListPersonByPermId.java
index 9a665e4ca4f..4e30bfbb1e8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/person/ListPersonByPermId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/person/ListPersonByPermId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 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.asapi.v3.helper.person;
 
 import java.util.LinkedList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/plugin/ListPluginByPermId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/plugin/ListPluginByPermId.java
index 5a3f08a5ec5..0d20794fff7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/plugin/ListPluginByPermId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/plugin/ListPluginByPermId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 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.ethz.sis.openbis.generic.server.asapi.v3.helper.plugin;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/plugin/PluginComparatorFactory.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/plugin/PluginComparatorFactory.java
index 7e53021ebf6..ab16bbee710 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/plugin/PluginComparatorFactory.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/plugin/PluginComparatorFactory.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.asapi.v3.helper.plugin;
 
 import java.util.Comparator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/project/ListProjectByIdentifier.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/project/ListProjectByIdentifier.java
index 5465ecd087c..69a26404625 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/project/ListProjectByIdentifier.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/project/ListProjectByIdentifier.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.ethz.sis.openbis.generic.server.asapi.v3.helper.project;
 
 import java.util.LinkedList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/project/ListProjectByPermId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/project/ListProjectByPermId.java
index accd740aa19..6cb3b577e9f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/project/ListProjectByPermId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/project/ListProjectByPermId.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.ethz.sis.openbis.generic.server.asapi.v3.helper.project;
 
 import java.util.LinkedList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/project/ListProjectTechIdByIdentifier.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/project/ListProjectTechIdByIdentifier.java
index ccf6f977f60..261b4cce7e0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/project/ListProjectTechIdByIdentifier.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/project/ListProjectTechIdByIdentifier.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.ethz.sis.openbis.generic.server.asapi.v3.helper.project;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/project/ListProjectTechIdByPermId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/project/ListProjectTechIdByPermId.java
index 4f0714de2cf..869b308b6dc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/project/ListProjectTechIdByPermId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/project/ListProjectTechIdByPermId.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.ethz.sis.openbis.generic.server.asapi.v3.helper.project;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/project/ProjectComparatorFactory.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/project/ProjectComparatorFactory.java
index b469076fd30..106d8176ff2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/project/ProjectComparatorFactory.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/project/ProjectComparatorFactory.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.server.asapi.v3.helper.project;
 
 import java.util.Comparator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/project/ProjectQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/project/ProjectQuery.java
index c73dc243ea2..a546e449cfd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/project/ProjectQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/project/ProjectQuery.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.ethz.sis.openbis.generic.server.asapi.v3.helper.project;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/property/IPropertyQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/property/IPropertyQuery.java
index 9ffeba23a54..492853dfcc1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/property/IPropertyQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/property/IPropertyQuery.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.asapi.v3.helper.property;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/property/ListPropertyTypeByPermId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/property/ListPropertyTypeByPermId.java
index c6b9d04f0de..1dcbf2f7976 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/property/ListPropertyTypeByPermId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/property/ListPropertyTypeByPermId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 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.ethz.sis.openbis.generic.server.asapi.v3.helper.property;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/property/PropertyAssignmentComparatorFactory.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/property/PropertyAssignmentComparatorFactory.java
index 93b07657b74..38c8365884b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/property/PropertyAssignmentComparatorFactory.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/property/PropertyAssignmentComparatorFactory.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.asapi.v3.helper.property;
 
 import java.util.Comparator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/property/PropertyTypeComparatorFactory.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/property/PropertyTypeComparatorFactory.java
index f8c044fa695..691e74ecee2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/property/PropertyTypeComparatorFactory.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/property/PropertyTypeComparatorFactory.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.asapi.v3.helper.property;
 
 import java.util.Comparator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/query/ListQueryByName.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/query/ListQueryByName.java
index 4c1ae02d951..307973034a1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/query/ListQueryByName.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/query/ListQueryByName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 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.ethz.sis.openbis.generic.server.asapi.v3.helper.query;
 
 import java.util.LinkedList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/query/ListQueryByTechId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/query/ListQueryByTechId.java
index 5352e322ce6..3173d21336a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/query/ListQueryByTechId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/query/ListQueryByTechId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 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.ethz.sis.openbis.generic.server.asapi.v3.helper.query;
 
 import java.util.LinkedList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/query/QueryDatabaseComparatorFactory.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/query/QueryDatabaseComparatorFactory.java
index 44ce8a84da9..5956f12ba81 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/query/QueryDatabaseComparatorFactory.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/query/QueryDatabaseComparatorFactory.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.asapi.v3.helper.query;
 
 import java.util.Comparator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/roleassignment/ListRoleAssignmentPEByTechId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/roleassignment/ListRoleAssignmentPEByTechId.java
index f071e7bd098..3deb9d5fe59 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/roleassignment/ListRoleAssignmentPEByTechId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/roleassignment/ListRoleAssignmentPEByTechId.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.asapi.v3.helper.roleassignment;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/roleassignment/ListRoleAssignmentTechIdByTechId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/roleassignment/ListRoleAssignmentTechIdByTechId.java
index 2f044754a07..a0952748a57 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/roleassignment/ListRoleAssignmentTechIdByTechId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/roleassignment/ListRoleAssignmentTechIdByTechId.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.asapi.v3.helper.roleassignment;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/roleassignment/RoleAssignmentQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/roleassignment/RoleAssignmentQuery.java
index 4cb78c9c50f..556255dc60b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/roleassignment/RoleAssignmentQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/roleassignment/RoleAssignmentQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 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.ethz.sis.openbis.generic.server.asapi.v3.helper.roleassignment;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/roleassignment/RoleAssignmentUtils.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/roleassignment/RoleAssignmentUtils.java
index 39200f4358d..2ecc32f77b6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/roleassignment/RoleAssignmentUtils.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/roleassignment/RoleAssignmentUtils.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.asapi.v3.helper.roleassignment;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/FullSampleIdentifier.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/FullSampleIdentifier.java
index 8fc092a30a1..06ec4a14fae 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/FullSampleIdentifier.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/FullSampleIdentifier.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.ethz.sis.openbis.generic.server.asapi.v3.helper.sample;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/ListSampleByIdentifier.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/ListSampleByIdentifier.java
index d88f503ce43..134a79b5994 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/ListSampleByIdentifier.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/ListSampleByIdentifier.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.ethz.sis.openbis.generic.server.asapi.v3.helper.sample;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/ListSampleByPermId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/ListSampleByPermId.java
index 2ae5d506cf6..5550d159298 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/ListSampleByPermId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/ListSampleByPermId.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.ethz.sis.openbis.generic.server.asapi.v3.helper.sample;
 
 import java.util.LinkedList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/ListSampleTechIdByIdentifier.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/ListSampleTechIdByIdentifier.java
index 6b3e0e0a87c..442943a7e2e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/ListSampleTechIdByIdentifier.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/ListSampleTechIdByIdentifier.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.ethz.sis.openbis.generic.server.asapi.v3.helper.sample;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/ListSampleTechIdByPermId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/ListSampleTechIdByPermId.java
index 982fa4dbaf7..676588e98e9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/ListSampleTechIdByPermId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/ListSampleTechIdByPermId.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.ethz.sis.openbis.generic.server.asapi.v3.helper.sample;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/SampleComparatorFactory.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/SampleComparatorFactory.java
index 8a1c3ddb2d2..1044e7847e1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/SampleComparatorFactory.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/SampleComparatorFactory.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.server.asapi.v3.helper.sample;
 
 import java.util.Comparator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/SampleContextDescription.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/SampleContextDescription.java
index debdd8caa63..70550a7f88e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/SampleContextDescription.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/SampleContextDescription.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.ethz.sis.openbis.generic.server.asapi.v3.helper.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.create.SampleCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/SampleIdentifierParts.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/SampleIdentifierParts.java
index e90af9023c8..0aaf10247e7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/SampleIdentifierParts.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/SampleIdentifierParts.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.ethz.sis.openbis.generic.server.asapi.v3.helper.sample;
 
 public final class SampleIdentifierParts
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/SampleQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/SampleQuery.java
index 7de96849bd0..6c4aa4bc700 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/SampleQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/SampleQuery.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.ethz.sis.openbis.generic.server.asapi.v3.helper.sample;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/SampleUtils.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/SampleUtils.java
index f79da5de2b4..c73ed1ca1a2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/SampleUtils.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sample/SampleUtils.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.asapi.v3.helper.sample;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/semanticannotation/ListSemanticAnnotationByPermId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/semanticannotation/ListSemanticAnnotationByPermId.java
index c43485d5a51..9fb22ec5e09 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/semanticannotation/ListSemanticAnnotationByPermId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/semanticannotation/ListSemanticAnnotationByPermId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 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.ethz.sis.openbis.generic.server.asapi.v3.helper.semanticannotation;
 
 import java.util.LinkedList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/semanticannotation/ListSemanticAnnotationTechIdByPermId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/semanticannotation/ListSemanticAnnotationTechIdByPermId.java
index 8087ec95aec..b12fcfad558 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/semanticannotation/ListSemanticAnnotationTechIdByPermId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/semanticannotation/ListSemanticAnnotationTechIdByPermId.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.ethz.sis.openbis.generic.server.asapi.v3.helper.semanticannotation;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/semanticannotation/SemanticAnnotationQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/semanticannotation/SemanticAnnotationQuery.java
index abae1f3eff8..dc85ae17265 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/semanticannotation/SemanticAnnotationQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/semanticannotation/SemanticAnnotationQuery.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.ethz.sis.openbis.generic.server.asapi.v3.helper.semanticannotation;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/service/CustomASServiceScriptRunnerFactory.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/service/CustomASServiceScriptRunnerFactory.java
index 8b35ee72c88..02cadf1a5d9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/service/CustomASServiceScriptRunnerFactory.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/service/CustomASServiceScriptRunnerFactory.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.ethz.sis.openbis.generic.server.asapi.v3.helper.service;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/service/IScriptRunnerFactory.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/service/IScriptRunnerFactory.java
index c8053e8c454..c319a097c21 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/service/IScriptRunnerFactory.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/service/IScriptRunnerFactory.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.ethz.sis.openbis.generic.server.asapi.v3.helper.service;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.plugin.service.context.ServiceContext;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/service/IServiceScriptRunner.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/service/IServiceScriptRunner.java
index adffa8ffc76..c4b94cb82c6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/service/IServiceScriptRunner.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/service/IServiceScriptRunner.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.ethz.sis.openbis.generic.server.asapi.v3.helper.service;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/service/ImportService.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/service/ImportService.java
index 1371cd7537f..eb2051107bc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/service/ImportService.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/service/ImportService.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.asapi.v3.helper.service;
 
 import java.util.Iterator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/service/JythonBasedCustomASServiceExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/service/JythonBasedCustomASServiceExecutor.java
index 3c56376af5a..c85504d2386 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/service/JythonBasedCustomASServiceExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/service/JythonBasedCustomASServiceExecutor.java
@@ -1,6 +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.
@@ -14,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.server.asapi.v3.helper.service;
 
 import java.util.Properties;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/AbstractComparator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/AbstractComparator.java
index d8f01c34415..af162dfa197 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/AbstractComparator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/AbstractComparator.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.ethz.sis.openbis.generic.server.asapi.v3.helper.sort;
 
 import java.util.Comparator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/AbstractStringComparator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/AbstractStringComparator.java
index 713725d5e07..1fb1bf275e1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/AbstractStringComparator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/AbstractStringComparator.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.ethz.sis.openbis.generic.server.asapi.v3.helper.sort;
 
 import ch.systemsx.cisd.common.collection.AlphanumComparator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/CodeComparator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/CodeComparator.java
index e4ca2f8cbb5..8539b509da9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/CodeComparator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/CodeComparator.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.ethz.sis.openbis.generic.server.asapi.v3.helper.sort;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.ICodeHolder;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/ComparatorFactory.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/ComparatorFactory.java
index e4eb369e0ad..5d4440a8c01 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/ComparatorFactory.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/ComparatorFactory.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.asapi.v3.helper.sort;
 
 import java.util.Comparator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/CompositeComparator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/CompositeComparator.java
index 8bcf56bfd10..ca7c6ca82e2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/CompositeComparator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/CompositeComparator.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.server.asapi.v3.helper.sort;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/EntityComparatorFactory.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/EntityComparatorFactory.java
index 213a197831c..bfbf40a33cc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/EntityComparatorFactory.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/EntityComparatorFactory.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.asapi.v3.helper.sort;
 
 import java.util.Comparator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/EntityWithPropertiesComparatorFactory.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/EntityWithPropertiesComparatorFactory.java
index e57c58e1198..9d3221dfd63 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/EntityWithPropertiesComparatorFactory.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/EntityWithPropertiesComparatorFactory.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.asapi.v3.helper.sort;
 
 import java.util.Comparator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/FetchedFieldsScoreComparator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/FetchedFieldsScoreComparator.java
index 511f0b6ec64..0b6b9641062 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/FetchedFieldsScoreComparator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/FetchedFieldsScoreComparator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.asapi.v3.helper.sort;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/IdentifierComparator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/IdentifierComparator.java
index 572c2ed596e..f03ecbced05 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/IdentifierComparator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/IdentifierComparator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.helper.sort;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectIdentifier;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/ModificationDateComparator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/ModificationDateComparator.java
index 611ef18a89a..9320dbd94bc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/ModificationDateComparator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/ModificationDateComparator.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.ethz.sis.openbis.generic.server.asapi.v3.helper.sort;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/PermIdComparator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/PermIdComparator.java
index be219df4668..b1b9c614c03 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/PermIdComparator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/PermIdComparator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.helper.sort;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/PropertyComparator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/PropertyComparator.java
index 23f60a74d02..da6408bc645 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/PropertyComparator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/PropertyComparator.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.ethz.sis.openbis.generic.server.asapi.v3.helper.sort;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IPropertiesHolder;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/RegistrationDateComparator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/RegistrationDateComparator.java
index b8906f3080f..ece26d595bb 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/RegistrationDateComparator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/RegistrationDateComparator.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.ethz.sis.openbis.generic.server.asapi.v3.helper.sort;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/SortAndPage.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/SortAndPage.java
index 82f4e325199..b1b73bb6666 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/SortAndPage.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/SortAndPage.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.asapi.v3.helper.sort;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchIgnore;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/TypeComparator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/TypeComparator.java
index aaaaea8957e..aa0f0ffb339 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/TypeComparator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/TypeComparator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.helper.sort;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IEntityType;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/space/ListSpaceByPermId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/space/ListSpaceByPermId.java
index 62e2d7b0602..0ed597bdbd6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/space/ListSpaceByPermId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/space/ListSpaceByPermId.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.ethz.sis.openbis.generic.server.asapi.v3.helper.space;
 
 import java.util.LinkedList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/space/ListSpaceByTechId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/space/ListSpaceByTechId.java
index 43a60624604..dd092d69bc6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/space/ListSpaceByTechId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/space/ListSpaceByTechId.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.ethz.sis.openbis.generic.server.asapi.v3.helper.space;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.id.SpaceTechId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/space/ListSpaceTechIdByPermId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/space/ListSpaceTechIdByPermId.java
index 765d70a24dd..5db26e0c133 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/space/ListSpaceTechIdByPermId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/space/ListSpaceTechIdByPermId.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.ethz.sis.openbis.generic.server.asapi.v3.helper.space;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/space/SpaceComparatorFactory.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/space/SpaceComparatorFactory.java
index eddfb8cf367..8efdb417ded 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/space/SpaceComparatorFactory.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/space/SpaceComparatorFactory.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.ethz.sis.openbis.generic.server.asapi.v3.helper.space;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.Space;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/space/SpaceQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/space/SpaceQuery.java
index e23000a6630..de030263673 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/space/SpaceQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/space/SpaceQuery.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.ethz.sis.openbis.generic.server.asapi.v3.helper.space;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/tag/TagAuthorization.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/tag/TagAuthorization.java
index 29506be4c11..02f805956e4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/tag/TagAuthorization.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/tag/TagAuthorization.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.server.asapi.v3.helper.tag;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.id.TagPermId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/tag/TagComparatorFactory.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/tag/TagComparatorFactory.java
index 598231a9f07..19297500e3a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/tag/TagComparatorFactory.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/tag/TagComparatorFactory.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.asapi.v3.helper.tag;
 
 import java.util.Comparator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/vocabulary/ListVocabularyByPermId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/vocabulary/ListVocabularyByPermId.java
index 9b9ea0f5e45..81544627cf9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/vocabulary/ListVocabularyByPermId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/vocabulary/ListVocabularyByPermId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 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.asapi.v3.helper.vocabulary;
 
 import java.util.LinkedList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/vocabulary/ListVocabularyTermByPermId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/vocabulary/ListVocabularyTermByPermId.java
index dd799852387..1884fbfcb27 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/vocabulary/ListVocabularyTermByPermId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/vocabulary/ListVocabularyTermByPermId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 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.server.asapi.v3.helper.vocabulary;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/vocabulary/OrdinalComparator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/vocabulary/OrdinalComparator.java
index 7985fe6780f..1569c271a44 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/vocabulary/OrdinalComparator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/vocabulary/OrdinalComparator.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.ethz.sis.openbis.generic.server.asapi.v3.helper.vocabulary;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.VocabularyTerm;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/vocabulary/VocabularyComparatorFactory.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/vocabulary/VocabularyComparatorFactory.java
index dab46dbd380..64095d3d350 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/vocabulary/VocabularyComparatorFactory.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/vocabulary/VocabularyComparatorFactory.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.asapi.v3.helper.vocabulary;
 
 import java.util.Comparator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/vocabulary/VocabularyTermComparatorFactory.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/vocabulary/VocabularyTermComparatorFactory.java
index 35bdb6d11d9..be62f8f2ae9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/vocabulary/VocabularyTermComparatorFactory.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/vocabulary/VocabularyTermComparatorFactory.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.asapi.v3.helper.vocabulary;
 
 import java.util.Comparator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/PSQLTypes.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/PSQLTypes.java
index 7d35ac920f0..bb7fa3d7ce6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/PSQLTypes.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/PSQLTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/auth/AuthorisationInformation.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/auth/AuthorisationInformation.java
index 850d451b711..2e9b73f7890 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/auth/AuthorisationInformation.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/auth/AuthorisationInformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.auth;
 
 import ch.systemsx.cisd.openbis.generic.shared.authorization.AuthorizationConfig;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/auth/ISQLAuthorisationInformationProviderDAO.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/auth/ISQLAuthorisationInformationProviderDAO.java
index 35358da701c..1a0ad5b3e86 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/auth/ISQLAuthorisationInformationProviderDAO.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/auth/ISQLAuthorisationInformationProviderDAO.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.ethz.sis.openbis.generic.server.asapi.v3.search.auth;
 
 import java.util.Set;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/auth/PostgresAuthorisationInformationProviderDAO.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/auth/PostgresAuthorisationInformationProviderDAO.java
index 749cab843e6..9fca2356c92 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/auth/PostgresAuthorisationInformationProviderDAO.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/auth/PostgresAuthorisationInformationProviderDAO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.auth;
 
 import static ch.ethz.sis.openbis.generic.server.asapi.v3.search.translator.SQLLexemes.*;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/dao/IPropertyAssignmentSearchDAO.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/dao/IPropertyAssignmentSearchDAO.java
index 59e33da99b8..65d39dccb05 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/dao/IPropertyAssignmentSearchDAO.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/dao/IPropertyAssignmentSearchDAO.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.asapi.v3.search.dao;
 
 import java.util.Set;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/dao/ISQLSearchDAO.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/dao/ISQLSearchDAO.java
index 8237e1562a3..cf6760ad9e1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/dao/ISQLSearchDAO.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/dao/ISQLSearchDAO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.dao;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/dao/PostgresSearchDAO.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/dao/PostgresSearchDAO.java
index b9de205b150..9fa2c9e202a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/dao/PostgresSearchDAO.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/dao/PostgresSearchDAO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.dao;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/dao/PropertyAssignmentSearchDAO.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/dao/PropertyAssignmentSearchDAO.java
index 8e820b07a0e..9ed6eff2a55 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/dao/PropertyAssignmentSearchDAO.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/dao/PropertyAssignmentSearchDAO.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.asapi.v3.search.dao;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.search.sql.ISQLExecutor;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/hibernate/IID2PEMapper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/hibernate/IID2PEMapper.java
index 2654489d6ac..2f270917eb4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/hibernate/IID2PEMapper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/hibernate/IID2PEMapper.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.ethz.sis.openbis.generic.server.asapi.v3.search.hibernate;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/hibernate/IdentityMapper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/hibernate/IdentityMapper.java
index 566f0e5876b..7d526b63283 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/hibernate/IdentityMapper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/hibernate/IdentityMapper.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.ethz.sis.openbis.generic.server.asapi.v3.search.hibernate;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/mapper/AttributesMapper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/mapper/AttributesMapper.java
index 91804245109..662e3362ca1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/mapper/AttributesMapper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/mapper/AttributesMapper.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.ethz.sis.openbis.generic.server.asapi.v3.search.mapper;
 
 import static ch.ethz.sis.openbis.generic.server.asapi.v3.search.mapper.TableMapper.DATA_SET;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/mapper/CriteriaMapper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/mapper/CriteriaMapper.java
index a555d6e885f..2540d9a5872 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/mapper/CriteriaMapper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/mapper/CriteriaMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, CISD
+ * 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.asapi.v3.search.mapper;
 
 import static ch.systemsx.cisd.openbis.generic.shared.dto.ColumnNames.DATA_SET_COLUMN;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/mapper/TableMapper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/mapper/TableMapper.java
index 431f6a27894..e42a580b9d8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/mapper/TableMapper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/mapper/TableMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.mapper;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.EntityKind;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/AbstractCompositeEntitySearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/AbstractCompositeEntitySearchManager.java
index 8930c3db859..4be32773093 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/AbstractCompositeEntitySearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/AbstractCompositeEntitySearchManager.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.ethz.sis.openbis.generic.server.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractCompositeSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/AbstractLocalSearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/AbstractLocalSearchManager.java
index f2f85660b21..672ec3a10ab 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/AbstractLocalSearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/AbstractLocalSearchManager.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.ethz.sis.openbis.generic.server.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.*;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/AbstractSearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/AbstractSearchManager.java
index 4e01f0a5b45..eb91b6bdf32 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/AbstractSearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/AbstractSearchManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in 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.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/ContentCopySearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/ContentCopySearchManager.java
index f5d2b7a2fc9..e773fed3b78 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/ContentCopySearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/ContentCopySearchManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/DataSetKindSearchCriteria.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/DataSetKindSearchCriteria.java
index b8b62af03ab..5fb8fc9695a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/DataSetKindSearchCriteria.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/DataSetKindSearchCriteria.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.ethz.sis.openbis.generic.server.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/DataSetSearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/DataSetSearchManager.java
index 757d555da9e..62f811934cd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/DataSetSearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/DataSetSearchManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/DataSetTypeSearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/DataSetTypeSearchManager.java
index 8f3b4f3c259..1bc8f808018 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/DataSetTypeSearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/DataSetTypeSearchManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/DummyCompositeSearchCriterion.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/DummyCompositeSearchCriterion.java
index a0436bdd230..0b425c9fe0f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/DummyCompositeSearchCriterion.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/DummyCompositeSearchCriterion.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.ethz.sis.openbis.generic.server.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractCompositeSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/EntityTypeSearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/EntityTypeSearchManager.java
index 643cb8a58b0..2f145094aaa 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/EntityTypeSearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/EntityTypeSearchManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/EventSearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/EventSearchManager.java
index 4658e0d3292..12548fa7f97 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/EventSearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/EventSearchManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/ExperimentSearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/ExperimentSearchManager.java
index bbec8202433..cc4420cc84f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/ExperimentSearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/ExperimentSearchManager.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.ethz.sis.openbis.generic.server.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/ExperimentTypeSearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/ExperimentTypeSearchManager.java
index 2a252a0344b..d4353aa6116 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/ExperimentTypeSearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/ExperimentTypeSearchManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/ExternalDmsSearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/ExternalDmsSearchManager.java
index 43ae3362ce6..84fd1b1b1c3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/ExternalDmsSearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/ExternalDmsSearchManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/FileFormatTypeSearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/FileFormatTypeSearchManager.java
index b47b289c6cb..1998c00d46e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/FileFormatTypeSearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/FileFormatTypeSearchManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/GlobalSearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/GlobalSearchManager.java
index a26af042de3..180bbed1b90 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/GlobalSearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/GlobalSearchManager.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.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/IFieldSearchCriterionFactory.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/IFieldSearchCriterionFactory.java
index 30c8ffcf781..fe47f82aaf1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/IFieldSearchCriterionFactory.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/IFieldSearchCriterionFactory.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.ethz.sis.openbis.generic.server.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractFieldSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/IGlobalSearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/IGlobalSearchManager.java
index c15ff886602..48f2190505e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/IGlobalSearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/IGlobalSearchManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/ILocalSearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/ILocalSearchManager.java
index 683000be7fc..60b316f4c26 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/ILocalSearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/ILocalSearchManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.planner;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/ISearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/ISearchManager.java
index 3ea6b366677..25afbe3555b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/ISearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/ISearchManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.planner;
 
 public interface ISearchManager
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/LinkedDataSetKindSearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/LinkedDataSetKindSearchManager.java
index c50851105e2..c0f43b7a5b0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/LinkedDataSetKindSearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/LinkedDataSetKindSearchManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/LocatorTypeSearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/LocatorTypeSearchManager.java
index 26e7fed5a62..6c5386fc69d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/LocatorTypeSearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/LocatorTypeSearchManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/MaterialSearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/MaterialSearchManager.java
index d55ce3701dd..6156b75a51a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/MaterialSearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/MaterialSearchManager.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.ethz.sis.openbis.generic.server.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/MaterialTypeSearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/MaterialTypeSearchManager.java
index 9b3b4114936..266a41da987 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/MaterialTypeSearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/MaterialTypeSearchManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/PersonSearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/PersonSearchManager.java
index c436360350d..359d2f4c5eb 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/PersonSearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/PersonSearchManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/PhysicalDataSetKindSearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/PhysicalDataSetKindSearchManager.java
index e6e33818fa4..e124d16f9db 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/PhysicalDataSetKindSearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/PhysicalDataSetKindSearchManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/ProjectSearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/ProjectSearchManager.java
index 66a460f22e8..1ce9f6ab54c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/ProjectSearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/ProjectSearchManager.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.ethz.sis.openbis.generic.server.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/PropertyAssignmentSearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/PropertyAssignmentSearchManager.java
index a8f52326521..b0bf8b9cd44 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/PropertyAssignmentSearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/PropertyAssignmentSearchManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/PropertyTypeSearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/PropertyTypeSearchManager.java
index 168e9234eb6..c25a9942164 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/PropertyTypeSearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/PropertyTypeSearchManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/SampleContainerSearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/SampleContainerSearchManager.java
index b7ceeabdd0e..50d6c9e5a7a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/SampleContainerSearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/SampleContainerSearchManager.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.ethz.sis.openbis.generic.server.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/SampleSearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/SampleSearchManager.java
index 6cb38aaa4ba..22d65df1817 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/SampleSearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/SampleSearchManager.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.ethz.sis.openbis.generic.server.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/SampleTypeSearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/SampleTypeSearchManager.java
index da212603a9c..11fc4cc0634 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/SampleTypeSearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/SampleTypeSearchManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/SemanticAnnotationSearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/SemanticAnnotationSearchManager.java
index 495c05322db..7dacc68b9e2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/SemanticAnnotationSearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/SemanticAnnotationSearchManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/SpaceSearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/SpaceSearchManager.java
index 56581ee4c97..3238e7cbbb1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/SpaceSearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/SpaceSearchManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/StorageFormatSearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/StorageFormatSearchManager.java
index b1762f1daf9..e618a3892c1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/StorageFormatSearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/StorageFormatSearchManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/TagSearchManager.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/TagSearchManager.java
index ed58a31222d..5626b2e9e68 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/TagSearchManager.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/planner/TagSearchManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.planner;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/sql/AbstractSQLExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/sql/AbstractSQLExecutor.java
index 43458f34b98..f535b1b4bd3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/sql/AbstractSQLExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/sql/AbstractSQLExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.sql;
 
 import java.sql.*;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/sql/HibernateSQLExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/sql/HibernateSQLExecutor.java
index ed3bdf1784e..aaf7fb08f96 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/sql/HibernateSQLExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/sql/HibernateSQLExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.search.sql;
 
 import ch.systemsx.cisd.openbis.generic.server.CommonServiceProvider;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/sql/ISQLExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/sql/ISQLExecutor.java
index 3b8598cc820..0ddc30ea464 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/sql/ISQLExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/sql/ISQLExecutor.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.ethz.sis.openbis.generic.server.asapi.v3.search.sql;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/GlobalSearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/GlobalSearchCriteriaTranslator.java
index 7e8de0c1f7f..fa25e8e8c34 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/GlobalSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/GlobalSearchCriteriaTranslator.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.asapi.v3.search.translator;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.Sorting;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/OrderTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/OrderTranslator.java
index 6cd178c9edc..0a8a1b01183 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/OrderTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/OrderTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.translator;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.EntitySortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/SQLLexemes.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/SQLLexemes.java
index 6b44429d6f0..52680949a45 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/SQLLexemes.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/SQLLexemes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.translator;
 
 public class SQLLexemes
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/SearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/SearchCriteriaTranslator.java
index 8202df80f98..e5cb7717a4e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/SearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/SearchCriteriaTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.translator;
 
 import static ch.ethz.sis.openbis.generic.server.asapi.v3.search.translator.SQLLexemes.*;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/SelectQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/SelectQuery.java
index f9c51886ed8..77739ab8a31 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/SelectQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/SelectQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.translator;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/TranslationContext.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/TranslationContext.java
index 0e6540fd81e..3343a7b8d77 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/TranslationContext.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/TranslationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.translator;
 
 import java.util.*;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/AbsenceConditionTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/AbsenceConditionTranslator.java
index db532c27afd..6783916998e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/AbsenceConditionTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/AbsenceConditionTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.translator.condition;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/AnyFieldSearchConditionTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/AnyFieldSearchConditionTranslator.java
index c22d62e7b33..717eb5945b0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/AnyFieldSearchConditionTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/AnyFieldSearchConditionTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.translator.condition;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.*;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/AnyPropertySearchConditionTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/AnyPropertySearchConditionTranslator.java
index a58e1bf7685..31c50355438 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/AnyPropertySearchConditionTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/AnyPropertySearchConditionTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.translator.condition;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/BooleanFieldSearchConditionTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/BooleanFieldSearchConditionTranslator.java
index 216c920ed27..43c45bb3612 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/BooleanFieldSearchConditionTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/BooleanFieldSearchConditionTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.translator.condition;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.BooleanFieldSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/CodeSearchConditionTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/CodeSearchConditionTranslator.java
index 195e5b0cf00..7b36a0084cd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/CodeSearchConditionTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/CodeSearchConditionTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.translator.condition;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/CollectionFieldSearchConditionTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/CollectionFieldSearchConditionTranslator.java
index 7d204245833..0020b115aea 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/CollectionFieldSearchConditionTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/CollectionFieldSearchConditionTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.translator.condition;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/CompleteSearchConditionTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/CompleteSearchConditionTranslator.java
index 28965e47753..ff269259990 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/CompleteSearchConditionTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/CompleteSearchConditionTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.search.translator.condition;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.Complete;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/ContainerRelationshipSearchConditionTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/ContainerRelationshipSearchConditionTranslator.java
index 083a7722c58..2591caf3c99 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/ContainerRelationshipSearchConditionTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/ContainerRelationshipSearchConditionTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.translator.condition;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/ControlledVocabularyPropertySearchConditionTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/ControlledVocabularyPropertySearchConditionTranslator.java
index c08564791cf..3a5e582ab41 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/ControlledVocabularyPropertySearchConditionTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/ControlledVocabularyPropertySearchConditionTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 ETH Zuerich, CISD
+ * Copyright ETH 2023 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in 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.asapi.v3.search.translator.condition;
 
 import static ch.ethz.sis.openbis.generic.server.asapi.v3.search.translator.SQLLexemes.AND;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/DataSetKindSearchConditionTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/DataSetKindSearchConditionTranslator.java
index ee12cb5b725..d549018fa8e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/DataSetKindSearchConditionTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/DataSetKindSearchConditionTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.search.translator.condition;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractStringValue;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/DateFieldSearchConditionTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/DateFieldSearchConditionTranslator.java
index 662e7a1ef76..a303a75de28 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/DateFieldSearchConditionTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/DateFieldSearchConditionTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.translator.condition;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.*;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/EmailSearchConditionTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/EmailSearchConditionTranslator.java
index 17da2bacffd..69148d06272 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/EmailSearchConditionTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/EmailSearchConditionTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.search.translator.condition;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/EnumFieldSearchConditionTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/EnumFieldSearchConditionTranslator.java
index 6c689d1e76f..b775531deec 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/EnumFieldSearchConditionTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/EnumFieldSearchConditionTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.search.translator.condition;
 
 import static ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType.ATTRIBUTE;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/EventEntityTypeConditionTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/EventEntityTypeConditionTranslator.java
index 012fcf2fe3b..bd824355186 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/EventEntityTypeConditionTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/EventEntityTypeConditionTranslator.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.openbis.generic.server.asapi.v3.search.translator.condition;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.event.EntityType;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/FirstNameSearchConditionTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/FirstNameSearchConditionTranslator.java
index b28b88414ef..a0d115ce1f7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/FirstNameSearchConditionTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/FirstNameSearchConditionTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.search.translator.condition;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractStringValue;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/IAliasFactory.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/IAliasFactory.java
index 030a6eba047..284c4a9a971 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/IAliasFactory.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/IAliasFactory.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.ethz.sis.openbis.generic.server.asapi.v3.search.translator.condition;
 
 public interface IAliasFactory
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/IConditionTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/IConditionTranslator.java
index d871bc6d018..abdb348c0ce 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/IConditionTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/IConditionTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.search.translator.condition;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/IdSearchConditionTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/IdSearchConditionTranslator.java
index 8eb87302b47..941ad997bb6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/IdSearchConditionTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/IdSearchConditionTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.translator.condition;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectIdentifier;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/IdentifierSearchConditionTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/IdentifierSearchConditionTranslator.java
index b534fe8303e..e97c47d2d5a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/IdentifierSearchConditionTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/IdentifierSearchConditionTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.translator.condition;
 
 import static ch.ethz.sis.openbis.generic.server.asapi.v3.search.translator.SearchCriteriaTranslator.MAIN_TABLE_ALIAS;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/LastNameSearchConditionTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/LastNameSearchConditionTranslator.java
index cd26b6a4e70..3ae0d7cd781 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/LastNameSearchConditionTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/LastNameSearchConditionTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.search.translator.condition;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractStringValue;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/ListableSampleTypeSearchConditionTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/ListableSampleTypeSearchConditionTranslator.java
index c57377cc773..36876c55c19 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/ListableSampleTypeSearchConditionTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/ListableSampleTypeSearchConditionTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.search.translator.condition;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/NameSearchConditionTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/NameSearchConditionTranslator.java
index 503f77987df..81b0608e25b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/NameSearchConditionTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/NameSearchConditionTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.
@@ -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.asapi.v3.search.translator.condition;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractStringValue;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/NumberFieldSearchConditionTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/NumberFieldSearchConditionTranslator.java
index 53054e4e1ce..8674fdab863 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/NumberFieldSearchConditionTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/NumberFieldSearchConditionTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.translator.condition;
 
 import static ch.ethz.sis.openbis.generic.server.asapi.v3.search.translator.SQLLexemes.AND;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/SamplePropertySearchConditionTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/SamplePropertySearchConditionTranslator.java
index 470e45f3301..e1f00305153 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/SamplePropertySearchConditionTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/SamplePropertySearchConditionTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 ETH Zuerich, CISD
+ * Copyright ETH 2023 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in 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.asapi.v3.search.translator.condition;
 
 import static ch.ethz.sis.openbis.generic.server.asapi.v3.search.translator.SQLLexemes.AND;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/StringFieldSearchConditionTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/StringFieldSearchConditionTranslator.java
index 8e8a227bbc1..80e6950d820 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/StringFieldSearchConditionTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/StringFieldSearchConditionTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.translator.condition;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/TextAttributeConditionTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/TextAttributeConditionTranslator.java
index 2fa48010c99..436677e50e1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/TextAttributeConditionTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/TextAttributeConditionTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.search.translator.condition;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.TextAttributeSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/UserIdSearchConditionTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/UserIdSearchConditionTranslator.java
index d9771a3fc76..2f8066808d0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/UserIdSearchConditionTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/UserIdSearchConditionTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.translator.condition;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/utils/FullEntityIdentifier.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/utils/FullEntityIdentifier.java
index 14452f1d506..f7c104ad351 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/utils/FullEntityIdentifier.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/utils/FullEntityIdentifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 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.asapi.v3.search.translator.condition.utils;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/utils/JoinInformation.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/utils/JoinInformation.java
index 0dce615ab7a..64d612d6c8a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/utils/JoinInformation.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/utils/JoinInformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.translator.condition.utils;
 
 public class JoinInformation
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/utils/JoinType.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/utils/JoinType.java
index 9d89c4ca1d4..80396d8e6d8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/utils/JoinType.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/utils/JoinType.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.ethz.sis.openbis.generic.server.asapi.v3.search.translator.condition.utils;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/utils/TranslatorUtils.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/utils/TranslatorUtils.java
index 0f0f3a0e79c..ddd15f960f5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/utils/TranslatorUtils.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/search/translator/condition/utils/TranslatorUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * 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.asapi.v3.search.translator.condition.utils;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.EntityWithPropertiesSortOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/task/AbstractOperationExecutionMarkMaintenanceTask.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/task/AbstractOperationExecutionMarkMaintenanceTask.java
index 07645a988d0..db17f275fc2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/task/AbstractOperationExecutionMarkMaintenanceTask.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/task/AbstractOperationExecutionMarkMaintenanceTask.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.server.asapi.v3.task;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/task/OperationExecutionMarkFailedAfterServerRestartMaintenanceTask.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/task/OperationExecutionMarkFailedAfterServerRestartMaintenanceTask.java
index 958a749e077..4b94459c809 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/task/OperationExecutionMarkFailedAfterServerRestartMaintenanceTask.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/task/OperationExecutionMarkFailedAfterServerRestartMaintenanceTask.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.server.asapi.v3.task;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/task/OperationExecutionMarkTimeOutPendingMaintenanceTask.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/task/OperationExecutionMarkTimeOutPendingMaintenanceTask.java
index dbc15a3cc9e..7347f984f7d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/task/OperationExecutionMarkTimeOutPendingMaintenanceTask.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/task/OperationExecutionMarkTimeOutPendingMaintenanceTask.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.server.asapi.v3.task;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/task/OperationExecutionMarkTimedOutOrDeletedMaintenanceTask.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/task/OperationExecutionMarkTimedOutOrDeletedMaintenanceTask.java
index f9c89ea83dc..e139432d459 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/task/OperationExecutionMarkTimedOutOrDeletedMaintenanceTask.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/task/OperationExecutionMarkTimedOutOrDeletedMaintenanceTask.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.server.asapi.v3.task;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/AbstractCachingTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/AbstractCachingTranslator.java
index dbe8d872066..f88e515a1d6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/AbstractCachingTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/AbstractCachingTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/AbstractTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/AbstractTranslator.java
index aee58f8daf9..096737582b1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/AbstractTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/AbstractTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/ITranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/ITranslator.java
index 2e45759bac7..af2cf809a58 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/ITranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/ITranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/NopTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/NopTranslator.java
index 921132bd65c..d6ba15bb6ad 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/NopTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/NopTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/TranslationCache.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/TranslationCache.java
index 5e66c122a22..79ee993b9b1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/TranslationCache.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/TranslationCache.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.ethz.sis.openbis.generic.server.asapi.v3.translator;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/TranslationContext.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/TranslationContext.java
index e7aff09507e..51414a2b0a7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/TranslationContext.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/TranslationContext.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.ethz.sis.openbis.generic.server.asapi.v3.translator;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.context.Context;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/TranslationResults.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/TranslationResults.java
index 5bce3af6b29..aa52e4f7017 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/TranslationResults.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/TranslationResults.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.translator;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/AttachmentBaseRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/AttachmentBaseRecord.java
index de0caeaa0cf..3b5bfc13e8a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/AttachmentBaseRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/AttachmentBaseRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.attachment;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/AttachmentBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/AttachmentBaseTranslator.java
index 649f2dbe764..6b182bcb09b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/AttachmentBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/AttachmentBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.attachment;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/AttachmentContentRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/AttachmentContentRecord.java
index ed95aedebe4..4f7ab0e85b7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/AttachmentContentRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/AttachmentContentRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.attachment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.ObjectBaseRecord;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/AttachmentContentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/AttachmentContentTranslator.java
index 9aeb98c3432..990a7b1c400 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/AttachmentContentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/AttachmentContentTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.attachment;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/AttachmentQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/AttachmentQuery.java
index 28322149851..d2d40493c74 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/AttachmentQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/AttachmentQuery.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.ethz.sis.openbis.generic.server.asapi.v3.translator.attachment;
 
 import it.unimi.dsi.fastutil.longs.LongSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/AttachmentRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/AttachmentRegistratorTranslator.java
index d5b7321d4e6..ba09b311169 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/AttachmentRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/AttachmentRegistratorTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.attachment;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/AttachmentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/AttachmentTranslator.java
index 55fdb813175..a7fa1da5559 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/AttachmentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/AttachmentTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.attachment;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/EntityAttachmentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/EntityAttachmentTranslator.java
index 51f32d40c24..863cbdda56a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/EntityAttachmentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/EntityAttachmentTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.attachment;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/IAttachmentBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/IAttachmentBaseTranslator.java
index 66650fd8847..496056a0074 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/IAttachmentBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/IAttachmentBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.attachment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectBaseTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/IAttachmentContentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/IAttachmentContentTranslator.java
index 3abe78ebb51..775b3798b29 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/IAttachmentContentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/IAttachmentContentTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.attachment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.EmptyFetchOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/IAttachmentRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/IAttachmentRegistratorTranslator.java
index 933ae598e65..046d65a6b15 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/IAttachmentRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/IAttachmentRegistratorTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.attachment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.person.IObjectToPersonTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/IAttachmentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/IAttachmentTranslator.java
index f624e18253c..3b466d0c33e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/IAttachmentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/IAttachmentTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.attachment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.attachment.Attachment;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/IEntityAttachmentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/IEntityAttachmentTranslator.java
index 0d8c37f0f8e..60b7642e3c1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/IEntityAttachmentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/attachment/IEntityAttachmentTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.attachment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.attachment.Attachment;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/AuthorizationGroupBaseRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/AuthorizationGroupBaseRecord.java
index 9b5036a51f6..ff2fa141ff4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/AuthorizationGroupBaseRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/AuthorizationGroupBaseRecord.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.asapi.v3.translator.authorizationgroup;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/AuthorizationGroupBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/AuthorizationGroupBaseTranslator.java
index 9d3c38b3873..fc42f9fc252 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/AuthorizationGroupBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/AuthorizationGroupBaseTranslator.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.asapi.v3.translator.authorizationgroup;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/AuthorizationGroupQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/AuthorizationGroupQuery.java
index 7fd641fedc4..bdad4c9ef2d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/AuthorizationGroupQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/AuthorizationGroupQuery.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.asapi.v3.translator.authorizationgroup;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/AuthorizationGroupRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/AuthorizationGroupRegistratorTranslator.java
index b525a74e0c8..03cfc8d9381 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/AuthorizationGroupRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/AuthorizationGroupRegistratorTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 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.ethz.sis.openbis.generic.server.asapi.v3.translator.authorizationgroup;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/AuthorizationGroupRoleAssignmentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/AuthorizationGroupRoleAssignmentTranslator.java
index 022b24c44c4..6401c4d9bde 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/AuthorizationGroupRoleAssignmentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/AuthorizationGroupRoleAssignmentTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 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.ethz.sis.openbis.generic.server.asapi.v3.translator.authorizationgroup;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/AuthorizationGroupTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/AuthorizationGroupTranslator.java
index ce419a11e0f..38b38d0938b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/AuthorizationGroupTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/AuthorizationGroupTranslator.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.asapi.v3.translator.authorizationgroup;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/AuthorizationGroupUserTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/AuthorizationGroupUserTranslator.java
index 8ca1f9bf641..fafe84a18e3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/AuthorizationGroupUserTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/AuthorizationGroupUserTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 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.ethz.sis.openbis.generic.server.asapi.v3.translator.authorizationgroup;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/IAuthorizationGroupBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/IAuthorizationGroupBaseTranslator.java
index 13bb440484a..f4ec3c2706d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/IAuthorizationGroupBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/IAuthorizationGroupBaseTranslator.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.asapi.v3.translator.authorizationgroup;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectBaseTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/IAuthorizationGroupRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/IAuthorizationGroupRegistratorTranslator.java
index 74edbd134e3..61cd4b00df4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/IAuthorizationGroupRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/IAuthorizationGroupRegistratorTranslator.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.asapi.v3.translator.authorizationgroup;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.person.IObjectToPersonTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/IAuthorizationGroupRoleAssignmentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/IAuthorizationGroupRoleAssignmentTranslator.java
index 45bff6c127a..3d23c19d900 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/IAuthorizationGroupRoleAssignmentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/IAuthorizationGroupRoleAssignmentTranslator.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.asapi.v3.translator.authorizationgroup;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.roleassignment.RoleAssignment;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/IAuthorizationGroupUserTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/IAuthorizationGroupUserTranslator.java
index 3a36a5cd7fa..387b8a41b1a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/IAuthorizationGroupUserTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/IAuthorizationGroupUserTranslator.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.asapi.v3.translator.authorizationgroup;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.Person;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/IObjectToAuthorizationGroupTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/IObjectToAuthorizationGroupTranslator.java
index 71b80c33708..7e1232369cf 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/IObjectToAuthorizationGroupTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/IObjectToAuthorizationGroupTranslator.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.asapi.v3.translator.authorizationgroup;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.authorizationgroup.AuthorizationGroup;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/ObjectToAuthorizationGroupTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/ObjectToAuthorizationGroupTranslator.java
index 249c49aadaf..3a198d112cd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/ObjectToAuthorizationGroupTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/authorizationgroup/ObjectToAuthorizationGroupTranslator.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.asapi.v3.translator.authorizationgroup;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/AbstractAuthorizationValidator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/AbstractAuthorizationValidator.java
index 69c1d495540..9bb73162197 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/AbstractAuthorizationValidator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/AbstractAuthorizationValidator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.common;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/IObjectAuthorizationValidator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/IObjectAuthorizationValidator.java
index bfb70b50279..cf6bb40d3a4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/IObjectAuthorizationValidator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/IObjectAuthorizationValidator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.common;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/IObjectBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/IObjectBaseTranslator.java
index 6db230e5be7..a795c89fc56 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/IObjectBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/IObjectBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.common;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.EmptyFetchOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/IObjectToManyRelationTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/IObjectToManyRelationTranslator.java
index b3dfc9a3563..e00f060c1a4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/IObjectToManyRelationTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/IObjectToManyRelationTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.common;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/IObjectToOneRelationTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/IObjectToOneRelationTranslator.java
index 5555b20ee57..bce6a9f8a73 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/IObjectToOneRelationTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/IObjectToOneRelationTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.common;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.ITranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/ObjectBaseRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/ObjectBaseRecord.java
index 4f99f4dc17f..21c5b6639ce 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/ObjectBaseRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/ObjectBaseRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.common;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/ObjectBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/ObjectBaseTranslator.java
index d54ca1f8d69..99b352cec48 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/ObjectBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/ObjectBaseTranslator.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.asapi.v3.translator.common;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/ObjectHolder.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/ObjectHolder.java
index 08a33b948df..fbef3bf32e8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/ObjectHolder.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/ObjectHolder.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.ethz.sis.openbis.generic.server.asapi.v3.translator.common;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/ObjectQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/ObjectQuery.java
index 3261f7b73f8..d6ed535f357 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/ObjectQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/ObjectQuery.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.ethz.sis.openbis.generic.server.asapi.v3.translator.common;
 
 import net.lemnik.eodsql.BaseQuery;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/ObjectRelationRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/ObjectRelationRecord.java
index 1cf20f90b65..adfccd9f6ec 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/ObjectRelationRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/ObjectRelationRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.common;
 
 public class ObjectRelationRecord
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/ObjectToManyRelationTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/ObjectToManyRelationTranslator.java
index f8f581d2636..a5179e59174 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/ObjectToManyRelationTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/ObjectToManyRelationTranslator.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.asapi.v3.translator.common;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/ObjectToOneRelationTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/ObjectToOneRelationTranslator.java
index 488b0d9cd6e..e134830a6b3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/ObjectToOneRelationTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/ObjectToOneRelationTranslator.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.asapi.v3.translator.common;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/TableModelTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/TableModelTranslator.java
index ecc13d5bcf1..6e323f45ba3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/TableModelTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/TableModelTranslator.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.asapi.v3.translator.common;
 
 import java.text.SimpleDateFormat;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/AbstractCompositeSearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/AbstractCompositeSearchCriteriaTranslator.java
index f1d516ef6b9..d684f31862d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/AbstractCompositeSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/AbstractCompositeSearchCriteriaTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.common.search;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/AbstractEntityAttributeProvider.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/AbstractEntityAttributeProvider.java
index 37b05adc450..f6eb37c2d70 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/AbstractEntityAttributeProvider.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/AbstractEntityAttributeProvider.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.ethz.sis.openbis.generic.server.asapi.v3.translator.common.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.DateEarlierThanOrEqualToValue;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/AbstractFieldFromCompositeSearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/AbstractFieldFromCompositeSearchCriteriaTranslator.java
index 164b4d3ecaf..7585fe3211e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/AbstractFieldFromCompositeSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/AbstractFieldFromCompositeSearchCriteriaTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.common.search;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/AbstractFieldSearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/AbstractFieldSearchCriteriaTranslator.java
index 3d8c67e9a08..e7aac4a5d1a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/AbstractFieldSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/AbstractFieldSearchCriteriaTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.common.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractFieldSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/AbstractSearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/AbstractSearchCriteriaTranslator.java
index e6c60c4d08c..71c55ddd192 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/AbstractSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/AbstractSearchCriteriaTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.common.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/AbstractSearchCriteriaTranslatorFactory.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/AbstractSearchCriteriaTranslatorFactory.java
index 38b635722c9..2a53340b7db 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/AbstractSearchCriteriaTranslatorFactory.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/AbstractSearchCriteriaTranslatorFactory.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.ethz.sis.openbis.generic.server.asapi.v3.translator.common.search;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/BooleanFieldSearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/BooleanFieldSearchCriteriaTranslator.java
index 71768a05dc6..5029a607c29 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/BooleanFieldSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/BooleanFieldSearchCriteriaTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.common.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.BooleanFieldSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/CollectionSearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/CollectionSearchCriteriaTranslator.java
index a173f718363..883c5ffe85d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/CollectionSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/CollectionSearchCriteriaTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.common.search;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/DateFieldSearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/DateFieldSearchCriteriaTranslator.java
index e32173c99e1..7e3aec63369 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/DateFieldSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/DateFieldSearchCriteriaTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.common.search;
 
 import java.text.SimpleDateFormat;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/EntityTypeSearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/EntityTypeSearchCriteriaTranslator.java
index bce364bee70..6430c419bff 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/EntityTypeSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/EntityTypeSearchCriteriaTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.common.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/EnumFieldSearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/EnumFieldSearchCriteriaTranslator.java
index aa781988013..1d02fafee9b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/EnumFieldSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/EnumFieldSearchCriteriaTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.server.asapi.v3.translator.common.search;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/IObjectAttributeProvider.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/IObjectAttributeProvider.java
index a93db0c14f1..95bbbf7bde8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/IObjectAttributeProvider.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/IObjectAttributeProvider.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.ethz.sis.openbis.generic.server.asapi.v3.translator.common.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/IObjectAttributeProviderFactory.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/IObjectAttributeProviderFactory.java
index a9c2b16047d..b0806ffe885 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/IObjectAttributeProviderFactory.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/IObjectAttributeProviderFactory.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.ethz.sis.openbis.generic.server.asapi.v3.translator.common.search;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/ISearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/ISearchCriteriaTranslator.java
index 3684d60f7e4..5bf0c423740 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/ISearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/ISearchCriteriaTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.common.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/NumberFieldSearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/NumberFieldSearchCriteriaTranslator.java
index 0a017e2239e..a60b075bb39 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/NumberFieldSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/NumberFieldSearchCriteriaTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.common.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractNumberValue;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/ObjectAttributeProviderFactory.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/ObjectAttributeProviderFactory.java
index c5fd00c685b..8488f36eba6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/ObjectAttributeProviderFactory.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/ObjectAttributeProviderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.server.asapi.v3.translator.common.search;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset.search.ContentCopyAttributeProvider;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/SearchCriteriaTranslationResult.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/SearchCriteriaTranslationResult.java
index b5ad8e38399..3eab12a81e3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/SearchCriteriaTranslationResult.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/SearchCriteriaTranslationResult.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.ethz.sis.openbis.generic.server.asapi.v3.translator.common.search;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/SearchCriteriaTranslatorFactory.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/SearchCriteriaTranslatorFactory.java
index 753e41620d6..b32e46e70b2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/SearchCriteriaTranslatorFactory.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/SearchCriteriaTranslatorFactory.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.ethz.sis.openbis.generic.server.asapi.v3.translator.common.search;
 
 import java.util.LinkedList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/SearchObjectKind.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/SearchObjectKind.java
index cc03a2c5884..b0c68e1a0f7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/SearchObjectKind.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/SearchObjectKind.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.ethz.sis.openbis.generic.server.asapi.v3.translator.common.search;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/SearchTranslationContext.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/SearchTranslationContext.java
index 710746da941..9ff98ce4d10 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/SearchTranslationContext.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/SearchTranslationContext.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.ethz.sis.openbis.generic.server.asapi.v3.translator.common.search;
 
 import java.util.Stack;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/StringFieldSearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/StringFieldSearchCriteriaTranslator.java
index 46e0a2d1295..d6872db9f2e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/StringFieldSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/common/search/StringFieldSearchCriteriaTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.common.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractStringValue;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ContentCopyBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ContentCopyBaseTranslator.java
index 313623a91ee..5f260c972c6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ContentCopyBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ContentCopyBaseTranslator.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.asapi.v3.translator.dataset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ContentCopyExternalDmsTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ContentCopyExternalDmsTranslator.java
index fabbe1d92a4..1010dc7a547 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ContentCopyExternalDmsTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ContentCopyExternalDmsTranslator.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.asapi.v3.translator.dataset;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ContentCopyRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ContentCopyRecord.java
index 1157f4b3b2f..2546a752dd1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ContentCopyRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ContentCopyRecord.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.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.ObjectBaseRecord;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ContentCopyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ContentCopyTranslator.java
index 9f8c885dc66..ead0fe9ffe5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ContentCopyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ContentCopyTranslator.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.asapi.v3.translator.dataset;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetAuthorizationValidator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetAuthorizationValidator.java
index f575f645396..f477e4efa77 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetAuthorizationValidator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetAuthorizationValidator.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.asapi.v3.translator.dataset;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetBaseRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetBaseRecord.java
index be8021319e2..1fe8d1ae2a5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetBaseRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetBaseRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetBaseTranslator.java
index b19914c8064..722427572c9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetChildRelationshipHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetChildRelationshipHistoryTranslator.java
index 652e82ee869..6ac72821f4e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetChildRelationshipHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetChildRelationshipHistoryTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetChildTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetChildTranslator.java
index 1d65496dfdc..0cfc647fb8d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetChildTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetChildTranslator.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.asapi.v3.translator.dataset;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetComponentRelationshipHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetComponentRelationshipHistoryTranslator.java
index 2e97b203be1..8b94127cbb0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetComponentRelationshipHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetComponentRelationshipHistoryTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetComponentsTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetComponentsTranslator.java
index 3b9fa00802e..382b595286f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetComponentsTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetComponentsTranslator.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.asapi.v3.translator.dataset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetContainerRelationshipHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetContainerRelationshipHistoryTranslator.java
index a8349ac0e78..2c9c5872b0c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetContainerRelationshipHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetContainerRelationshipHistoryTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetContainerTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetContainerTranslator.java
index d7b8fea1f87..94ed54c0b3f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetContainerTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetContainerTranslator.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.asapi.v3.translator.dataset;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetContentCopyHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetContentCopyHistoryTranslator.java
index b5e6ad3e033..85561dbec32 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetContentCopyHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetContentCopyHistoryTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetDataStoreTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetDataStoreTranslator.java
index 52baee8ac01..fe9db3eb69b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetDataStoreTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetDataStoreTranslator.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.asapi.v3.translator.dataset;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetExperimentRelationshipHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetExperimentRelationshipHistoryTranslator.java
index 200668696a0..f462fcb97ef 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetExperimentRelationshipHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetExperimentRelationshipHistoryTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetExperimentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetExperimentTranslator.java
index 50503a03ee8..7c082b01bfe 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetExperimentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetExperimentTranslator.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.asapi.v3.translator.dataset;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetHistoryTranslator.java
index 0ed27489f1d..c1f53b0b291 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetHistoryTranslator.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.asapi.v3.translator.dataset;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetLinkedDataTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetLinkedDataTranslator.java
index 21aced94b08..50ac4987998 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetLinkedDataTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetLinkedDataTranslator.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.asapi.v3.translator.dataset;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetMaterialPropertyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetMaterialPropertyTranslator.java
index e5a053fa182..b524d788ffc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetMaterialPropertyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetMaterialPropertyTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetModifierTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetModifierTranslator.java
index 46f370b0dcc..04e241541ff 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetModifierTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetModifierTranslator.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.asapi.v3.translator.dataset;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetParentRelationshipHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetParentRelationshipHistoryTranslator.java
index 1be103a4341..1b732634214 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetParentRelationshipHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetParentRelationshipHistoryTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetParentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetParentTranslator.java
index 1d4804a7a59..6a34bfee1fd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetParentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetParentTranslator.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.asapi.v3.translator.dataset;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetPhysicalDataTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetPhysicalDataTranslator.java
index 711da17e324..21b54f39d42 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetPhysicalDataTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetPhysicalDataTranslator.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.asapi.v3.translator.dataset;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetPostRegisteredTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetPostRegisteredTranslator.java
index 82dae2a2a05..6b7b894e93a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetPostRegisteredTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetPostRegisteredTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetPropertyAssignmentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetPropertyAssignmentTranslator.java
index 2cc22af41eb..97e9e9c616d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetPropertyAssignmentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetPropertyAssignmentTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetPropertyHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetPropertyHistoryTranslator.java
index db47612d2a0..fa6fdc785a2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetPropertyHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetPropertyHistoryTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetPropertyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetPropertyTranslator.java
index 95fc3e6d8bc..a6099bb0b78 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetPropertyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetPropertyTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetQuery.java
index f8a01f80130..6a65a8ee667 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.asapi.v3.translator.dataset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetRegistratorTranslator.java
index bcb2fcda45b..b6288b0f8bd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetRegistratorTranslator.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.asapi.v3.translator.dataset;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetRelationshipHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetRelationshipHistoryTranslator.java
index 15cca9f1ea2..542f9efac73 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetRelationshipHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetRelationshipHistoryTranslator.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.asapi.v3.translator.dataset;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetRelationshipRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetRelationshipRecord.java
index 32448593f01..05cf64d6c19 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetRelationshipRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetRelationshipRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.history.HistoryRelationshipRecord;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetSamplePropertyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetSamplePropertyTranslator.java
index 1a0307fe62e..1ba2b54fc2e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetSamplePropertyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetSamplePropertyTranslator.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.asapi.v3.translator.dataset;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetSampleRelationshipHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetSampleRelationshipHistoryTranslator.java
index 68eacf95c71..f936f487d95 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetSampleRelationshipHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetSampleRelationshipHistoryTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetSampleTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetSampleTranslator.java
index f65ed6c1fda..4952bce6748 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetSampleTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetSampleTranslator.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.asapi.v3.translator.dataset;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetTagTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetTagTranslator.java
index cf5d23d9744..4e8054fabc1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetTagTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetTagTranslator.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.asapi.v3.translator.dataset;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetTranslator.java
index 4a3e77af101..0b445c9863d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.asapi.v3.translator.dataset;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetTypeBaseRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetTypeBaseRecord.java
index 195d9f93a58..963194c71d9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetTypeBaseRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetTypeBaseRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetTypeBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetTypeBaseTranslator.java
index e6c235ac7d4..7bee1fd125a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetTypeBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetTypeBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetTypeRelationTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetTypeRelationTranslator.java
index 3c0a5398ef8..d1692675c35 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetTypeRelationTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetTypeRelationTranslator.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.asapi.v3.translator.dataset;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetTypeTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetTypeTranslator.java
index 292835cc907..49d07c7cdaa 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetTypeTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetTypeTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetTypeValidationPluginTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetTypeValidationPluginTranslator.java
index 0449c1ab108..67d0be79ee7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetTypeValidationPluginTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetTypeValidationPluginTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetUnknownRelationshipHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetUnknownRelationshipHistoryTranslator.java
index d8a6b194c6c..3126a6b4d57 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetUnknownRelationshipHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/DataSetUnknownRelationshipHistoryTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/FileFormatTypeBaseRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/FileFormatTypeBaseRecord.java
index 3a4cf607982..b57fe5e58d9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/FileFormatTypeBaseRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/FileFormatTypeBaseRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.ObjectBaseRecord;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/FileFormatTypeBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/FileFormatTypeBaseTranslator.java
index 111a2c43d01..e32b72d999d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/FileFormatTypeBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/FileFormatTypeBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/FileFormatTypeTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/FileFormatTypeTranslator.java
index 1124098c31a..84bb276437c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/FileFormatTypeTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/FileFormatTypeTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IContentCopyBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IContentCopyBaseTranslator.java
index 17dedb68e7a..895f538bedd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IContentCopyBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IContentCopyBaseTranslator.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.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectBaseTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IContentCopyExternalDmsTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IContentCopyExternalDmsTranslator.java
index 37f94ba7d22..71b0cb539a0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IContentCopyExternalDmsTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IContentCopyExternalDmsTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.externaldms.ExternalDms;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IContentCopyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IContentCopyTranslator.java
index 39c51f43fa1..3cb217593e7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IContentCopyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IContentCopyTranslator.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.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.ContentCopy;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetAuthorizationValidator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetAuthorizationValidator.java
index 124377fcdf6..fe8357ed969 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetAuthorizationValidator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetAuthorizationValidator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectAuthorizationValidator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetBaseTranslator.java
index 36e5c746f2c..20667f39ef9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectBaseTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetChildTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetChildTranslator.java
index 5b19bf7cf1b..a0ebe49ff01 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetChildTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetChildTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetComponentsTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetComponentsTranslator.java
index 9182307989a..10875daa24f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetComponentsTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetComponentsTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetContainerTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetContainerTranslator.java
index 3a1a1adf0f2..ace206e15ca 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetContainerTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetContainerTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetDataStoreTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetDataStoreTranslator.java
index b2e33c37d4c..54ba1bcba43 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetDataStoreTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetDataStoreTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.datastore.DataStore;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetExperimentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetExperimentTranslator.java
index 1355a10b886..c59ca3ca0ed 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetExperimentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetExperimentTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment.IObjectToExperimentTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetHistoryTranslator.java
index 7fdfdf203a7..f74859b894b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetHistoryTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.history.IHistoryTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetLinkedDataTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetLinkedDataTranslator.java
index 0a370237e0f..41a12de54a7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetLinkedDataTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetLinkedDataTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.LinkedData;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetMaterialPropertyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetMaterialPropertyTranslator.java
index 503d9a2c0da..a2541be1ee0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetMaterialPropertyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetMaterialPropertyTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.property.IMaterialPropertyTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetModifierTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetModifierTranslator.java
index c52a74b9753..9887b0b6a70 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetModifierTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetModifierTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.person.IObjectToPersonTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetParentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetParentTranslator.java
index 1279c211b8a..0e8e069e2e3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetParentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetParentTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetPhysicalDataTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetPhysicalDataTranslator.java
index 846f93d2ad6..152e7e07c54 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetPhysicalDataTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetPhysicalDataTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.PhysicalData;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetPostRegisteredTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetPostRegisteredTranslator.java
index 88011128e54..139262849bd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetPostRegisteredTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetPostRegisteredTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.EmptyFetchOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetPropertyAssignmentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetPropertyAssignmentTranslator.java
index efd6df2ced8..a6d03929364 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetPropertyAssignmentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetPropertyAssignmentTranslator.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.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.PropertyAssignment;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetPropertyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetPropertyTranslator.java
index a06de21e7ac..bae44f1a76a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetPropertyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetPropertyTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.property.IPropertyTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetRegistratorTranslator.java
index 13842df62b2..bc5b71f57a2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetRegistratorTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.person.IObjectToPersonTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetSamplePropertyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetSamplePropertyTranslator.java
index 0b4be504b2f..a8d6bdad144 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetSamplePropertyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetSamplePropertyTranslator.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.asapi.v3.translator.dataset;
 
 public interface IDataSetSamplePropertyTranslator
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetSampleTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetSampleTranslator.java
index 35f6e8b1752..188893a5e18 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetSampleTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetSampleTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.sample.IObjectToSampleTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetTagTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetTagTranslator.java
index e7203b6b12b..ce68cb04600 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetTagTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetTagTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.tag.IObjectToTagsTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetTranslator.java
index 923385d7443..7c2f74f1928 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.DataSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetTypeBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetTypeBaseTranslator.java
index d3962d8b4b8..e29471b6b0b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetTypeBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetTypeBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectBaseTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetTypeRelationTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetTypeRelationTranslator.java
index 266ac20c2af..375893400fc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetTypeRelationTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetTypeRelationTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.DataSetType;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetTypeTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetTypeTranslator.java
index ca11b7b4757..53050ab40a2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetTypeTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetTypeTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.DataSetType;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetTypeValidationPluginTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetTypeValidationPluginTranslator.java
index 98dcca0d92b..f8ba6867772 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetTypeValidationPluginTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IDataSetTypeValidationPluginTranslator.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.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.plugin.IObjectToPluginTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IFileFormatTypeBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IFileFormatTypeBaseTranslator.java
index 16d7c59dc15..d8153846b65 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IFileFormatTypeBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IFileFormatTypeBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectBaseTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IFileFormatTypeTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IFileFormatTypeTranslator.java
index 52b9caa9f0e..f07760edfaa 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IFileFormatTypeTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IFileFormatTypeTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.FileFormatType;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ILinkedDataBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ILinkedDataBaseTranslator.java
index a9e64b1d56c..35b3cbd371b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ILinkedDataBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ILinkedDataBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectBaseTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ILinkedDataContentCopiesTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ILinkedDataContentCopiesTranslator.java
index 18b2be647d3..5b9d53c853a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ILinkedDataContentCopiesTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ILinkedDataContentCopiesTranslator.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.asapi.v3.translator.dataset;
 
 public interface ILinkedDataContentCopiesTranslator extends IObjectToContentCopiesTranslator
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ILinkedDataTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ILinkedDataTranslator.java
index 1a37882e6e5..ca8686beb5e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ILinkedDataTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ILinkedDataTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.LinkedData;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ILocatorTypeBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ILocatorTypeBaseTranslator.java
index cdb6f234e0b..57dabad4e09 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ILocatorTypeBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ILocatorTypeBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectBaseTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ILocatorTypeTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ILocatorTypeTranslator.java
index 92d661fd6c6..126dfe4b160 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ILocatorTypeTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ILocatorTypeTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.LocatorType;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IObjectToContentCopiesTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IObjectToContentCopiesTranslator.java
index 62a1a012521..1256331f376 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IObjectToContentCopiesTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IObjectToContentCopiesTranslator.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.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.ContentCopy;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IObjectToDataSetsTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IObjectToDataSetsTranslator.java
index fd949fd18a9..cf34b6b57e4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IObjectToDataSetsTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IObjectToDataSetsTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.DataSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IPhysicalDataBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IPhysicalDataBaseTranslator.java
index 8b984622e75..88bd8dede98 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IPhysicalDataBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IPhysicalDataBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectBaseTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IPhysicalDataFileFormatTypeTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IPhysicalDataFileFormatTypeTranslator.java
index e78e52202c4..3d0217838bb 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IPhysicalDataFileFormatTypeTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IPhysicalDataFileFormatTypeTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.FileFormatType;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IPhysicalDataLocatorTypeTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IPhysicalDataLocatorTypeTranslator.java
index edf2ea25d38..384ebf7e0a2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IPhysicalDataLocatorTypeTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IPhysicalDataLocatorTypeTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.LocatorType;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IPhysicalDataStorageFormatTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IPhysicalDataStorageFormatTranslator.java
index 533d3275abc..203b1d2884b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IPhysicalDataStorageFormatTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IPhysicalDataStorageFormatTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.StorageFormat;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IPhysicalDataTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IPhysicalDataTranslator.java
index f7fc5555efb..a84d4b24a87 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IPhysicalDataTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/IPhysicalDataTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.PhysicalData;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/LinkedDataBaseRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/LinkedDataBaseRecord.java
index c5c0f5ed7a3..1501187e733 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/LinkedDataBaseRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/LinkedDataBaseRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.ObjectBaseRecord;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/LinkedDataBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/LinkedDataBaseTranslator.java
index 306df2b83bc..4fcc9506ee3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/LinkedDataBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/LinkedDataBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/LinkedDataContentCopiesTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/LinkedDataContentCopiesTranslator.java
index 6ba395994fe..6903404aa60 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/LinkedDataContentCopiesTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/LinkedDataContentCopiesTranslator.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.asapi.v3.translator.dataset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/LinkedDataTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/LinkedDataTranslator.java
index 66c8707faf1..1199ca3bf58 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/LinkedDataTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/LinkedDataTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/LocatorTypeBaseRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/LocatorTypeBaseRecord.java
index 0db119ae894..635a0a4046e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/LocatorTypeBaseRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/LocatorTypeBaseRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.ObjectBaseRecord;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/LocatorTypeBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/LocatorTypeBaseTranslator.java
index 5ec19607f10..8e0ac76ba94 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/LocatorTypeBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/LocatorTypeBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/LocatorTypeTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/LocatorTypeTranslator.java
index 5b98e4ddc4d..1d9bb353a62 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/LocatorTypeTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/LocatorTypeTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ObjectToContentCopiesTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ObjectToContentCopiesTranslator.java
index ee88df83d2b..320f01681ee 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ObjectToContentCopiesTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ObjectToContentCopiesTranslator.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.asapi.v3.translator.dataset;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ObjectToDataSetsTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ObjectToDataSetsTranslator.java
index 870499fd922..31238b37c8f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ObjectToDataSetsTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/ObjectToDataSetsTranslator.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.asapi.v3.translator.dataset;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/PhysicalDataBaseRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/PhysicalDataBaseRecord.java
index 2f85bc385e6..b3781b6901c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/PhysicalDataBaseRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/PhysicalDataBaseRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.ObjectBaseRecord;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/PhysicalDataBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/PhysicalDataBaseTranslator.java
index d849347b6fc..f887f77cdf5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/PhysicalDataBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/PhysicalDataBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/PhysicalDataFileFormatTypeTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/PhysicalDataFileFormatTypeTranslator.java
index 6359ed3ee72..fa729e40169 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/PhysicalDataFileFormatTypeTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/PhysicalDataFileFormatTypeTranslator.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.asapi.v3.translator.dataset;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/PhysicalDataLocatorTypeTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/PhysicalDataLocatorTypeTranslator.java
index 07012526464..27339e69580 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/PhysicalDataLocatorTypeTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/PhysicalDataLocatorTypeTranslator.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.asapi.v3.translator.dataset;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/PhysicalDataStorageFormatTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/PhysicalDataStorageFormatTranslator.java
index 2d654488051..8dc7c12918d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/PhysicalDataStorageFormatTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/PhysicalDataStorageFormatTranslator.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.asapi.v3.translator.dataset;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/PhysicalDataTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/PhysicalDataTranslator.java
index 03a0e429315..9f3df93db04 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/PhysicalDataTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/PhysicalDataTranslator.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.asapi.v3.translator.dataset;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/CompleteSearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/CompleteSearchCriteriaTranslator.java
index 73212c63fc2..7340c94307a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/CompleteSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/CompleteSearchCriteriaTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.server.asapi.v3.translator.dataset.search;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/ContentCopyAttributeProvider.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/ContentCopyAttributeProvider.java
index 138201362bb..d93aabde6d8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/ContentCopyAttributeProvider.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/ContentCopyAttributeProvider.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/ContentCopySearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/ContentCopySearchCriteriaTranslator.java
index e35229fe09c..4820e9bd080 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/ContentCopySearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/ContentCopySearchCriteriaTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/DataSetAttributeProvider.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/DataSetAttributeProvider.java
index 693b7fa04a5..3098401f70c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/DataSetAttributeProvider.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/DataSetAttributeProvider.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.CodeSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/DataSetSearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/DataSetSearchCriteriaTranslator.java
index c122aa54ec9..69ea89a73f7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/DataSetSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/DataSetSearchCriteriaTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/FileFormatTypeAttributeProvider.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/FileFormatTypeAttributeProvider.java
index 260ba19b629..f3f6c9c2f62 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/FileFormatTypeAttributeProvider.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/FileFormatTypeAttributeProvider.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.CodeSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/FileFormatTypeSearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/FileFormatTypeSearchCriteriaTranslator.java
index b0d2c252ce8..9a77c5bbf82 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/FileFormatTypeSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/FileFormatTypeSearchCriteriaTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/LinkedDataAttributeProvider.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/LinkedDataAttributeProvider.java
index eab865ab7b9..bcff8929765 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/LinkedDataAttributeProvider.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/LinkedDataAttributeProvider.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/LinkedDataSearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/LinkedDataSearchCriteriaTranslator.java
index 78149051adb..9f7396174d8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/LinkedDataSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/LinkedDataSearchCriteriaTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/LocatorTypeAttributeProvider.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/LocatorTypeAttributeProvider.java
index 002e0578e74..a90b7adcfd9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/LocatorTypeAttributeProvider.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/LocatorTypeAttributeProvider.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.CodeSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/LocatorTypeSearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/LocatorTypeSearchCriteriaTranslator.java
index cd5c2edc419..f9873951fba 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/LocatorTypeSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/LocatorTypeSearchCriteriaTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/PhysicalDataAttributeProvider.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/PhysicalDataAttributeProvider.java
index f57acf8feb2..38c3dddda28 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/PhysicalDataAttributeProvider.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/PhysicalDataAttributeProvider.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.server.asapi.v3.translator.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/PhysicalDataSearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/PhysicalDataSearchCriteriaTranslator.java
index 5fbaeeb8aeb..4fc2560c27a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/PhysicalDataSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/PhysicalDataSearchCriteriaTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/StatusSearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/StatusSearchCriteriaTranslator.java
index 5c57c8c20e6..cf4ad446a5e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/StatusSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/StatusSearchCriteriaTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.server.asapi.v3.translator.dataset.search;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/StorageFormatAttributeProvider.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/StorageFormatAttributeProvider.java
index 90ac5aa55d2..8764bda3bee 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/StorageFormatAttributeProvider.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/StorageFormatAttributeProvider.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.CodeSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/StorageFormatSearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/StorageFormatSearchCriteriaTranslator.java
index f37a1a361a0..009f7c05090 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/StorageFormatSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/dataset/search/StorageFormatSearchCriteriaTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/datastore/DataStoreBaseRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/datastore/DataStoreBaseRecord.java
index 5f66d0563a4..f515d58f404 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/datastore/DataStoreBaseRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/datastore/DataStoreBaseRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.datastore;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/datastore/DataStoreBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/datastore/DataStoreBaseTranslator.java
index 1855ffa4bdb..16ac6dd1d59 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/datastore/DataStoreBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/datastore/DataStoreBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.datastore;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/datastore/DataStoreQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/datastore/DataStoreQuery.java
index 5dbc7c3a703..2dd447e38f4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/datastore/DataStoreQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/datastore/DataStoreQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.asapi.v3.translator.datastore;
 
 import it.unimi.dsi.fastutil.longs.LongSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/datastore/DataStoreTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/datastore/DataStoreTranslator.java
index 8f831cf9093..c5bf2782aa5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/datastore/DataStoreTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/datastore/DataStoreTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.translator.datastore;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/datastore/IDataStoreBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/datastore/IDataStoreBaseTranslator.java
index aedede10782..c8b8adab151 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/datastore/IDataStoreBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/datastore/IDataStoreBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.datastore;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectBaseTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/datastore/IDataStoreTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/datastore/IDataStoreTranslator.java
index 748339609c3..4d9aa399734 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/datastore/IDataStoreTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/datastore/IDataStoreTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.datastore;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.datastore.DataStore;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/deletion/DeletionTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/deletion/DeletionTranslator.java
index 718ecd6ca1e..190ec09ef5e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/deletion/DeletionTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/deletion/DeletionTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.deletion;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/deletion/IDeletionTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/deletion/IDeletionTranslator.java
index a133f1a1381..bd5c5e2c5a9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/deletion/IDeletionTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/deletion/IDeletionTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.deletion;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.Deletion;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/EventBaseRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/EventBaseRecord.java
index 35d103dfa50..a4982bdfc7b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/EventBaseRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/EventBaseRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.event;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.ObjectBaseRecord;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/EventBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/EventBaseTranslator.java
index 7a4227585ff..2907340f296 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/EventBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/EventBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.event;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.ObjectBaseTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/EventQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/EventQuery.java
index 0244059abc5..fdcb7ef7276 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/EventQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/EventQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, SIS
+ * 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.
@@ -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.asapi.v3.translator.event;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.ObjectQuery;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/EventRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/EventRegistratorTranslator.java
index 249a9cd3a1c..a80aab57fd7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/EventRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/EventRegistratorTranslator.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.asapi.v3.translator.event;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.ObjectRelationRecord;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/EventTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/EventTranslator.java
index faa0a7fbbbb..eed9464c0f5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/EventTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/EventTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.
@@ -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.asapi.v3.translator.event;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.event.EntityType;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/IEventBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/IEventBaseTranslator.java
index ab88e709109..05491c221d1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/IEventBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/IEventBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.event;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectBaseTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/IEventRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/IEventRegistratorTranslator.java
index 2a25e581ed7..cb5988bef91 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/IEventRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/IEventRegistratorTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.event;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.person.IObjectToPersonTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/IEventTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/IEventTranslator.java
index e2089b03f71..d55b8ed70f8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/IEventTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/event/IEventTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.event;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.event.Event;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentAttachmentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentAttachmentTranslator.java
index b2107d56041..d2161a1893f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentAttachmentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentAttachmentTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentAuthorizationValidator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentAuthorizationValidator.java
index 85eb19822e8..af408dbc4ee 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentAuthorizationValidator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentAuthorizationValidator.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.asapi.v3.translator.experiment;
 
 import java.util.*;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentBaseRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentBaseRecord.java
index 241951fabf9..f8d441c51be 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentBaseRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentBaseRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentBaseTranslator.java
index b4cd60fe6e6..9db77544593 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentDataSetRelationshipHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentDataSetRelationshipHistoryTranslator.java
index 342f25e6192..ac2a00e2fb9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentDataSetRelationshipHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentDataSetRelationshipHistoryTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentDataSetTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentDataSetTranslator.java
index 7babd8f2f07..8197f3d4a0b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentDataSetTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentDataSetTranslator.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.asapi.v3.translator.experiment;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentHistoryTranslator.java
index 761a9ad4fbf..29a79b56432 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentHistoryTranslator.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.asapi.v3.translator.experiment;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentMaterialPropertyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentMaterialPropertyTranslator.java
index 2f74f17b782..31ec5898da7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentMaterialPropertyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentMaterialPropertyTranslator.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.asapi.v3.translator.experiment;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentModifierTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentModifierTranslator.java
index b7822452692..eee92e009dd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentModifierTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentModifierTranslator.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.asapi.v3.translator.experiment;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentProjectRelationshipHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentProjectRelationshipHistoryTranslator.java
index 528c33c24a2..40da2727b2f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentProjectRelationshipHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentProjectRelationshipHistoryTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentProjectTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentProjectTranslator.java
index 1276ab2ba70..561f3c62055 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentProjectTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentProjectTranslator.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.asapi.v3.translator.experiment;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentPropertyAssignmentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentPropertyAssignmentTranslator.java
index b3dda8d0ade..72e70b40186 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentPropertyAssignmentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentPropertyAssignmentTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentPropertyHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentPropertyHistoryTranslator.java
index a9737fad591..a8d576c8795 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentPropertyHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentPropertyHistoryTranslator.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.asapi.v3.translator.experiment;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentPropertyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentPropertyTranslator.java
index 375783cc769..b6a3bfc28e7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentPropertyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentPropertyTranslator.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.asapi.v3.translator.experiment;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentQuery.java
index 4c5c48967ad..e9dff171603 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.asapi.v3.translator.experiment;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentRegistratorTranslator.java
index 749cbb0ee7b..f5112bd1731 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentRegistratorTranslator.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.asapi.v3.translator.experiment;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentRelationshipHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentRelationshipHistoryTranslator.java
index f02ef312bcc..64abb934d07 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentRelationshipHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentRelationshipHistoryTranslator.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.asapi.v3.translator.experiment;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentRelationshipRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentRelationshipRecord.java
index 86583c32e55..14aef1d5af0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentRelationshipRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentRelationshipRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.history.HistoryRelationshipRecord;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentSamplePropertyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentSamplePropertyTranslator.java
index 0d2086669ec..81cdba4e709 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentSamplePropertyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentSamplePropertyTranslator.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.asapi.v3.translator.experiment;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentSampleRelationshipHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentSampleRelationshipHistoryTranslator.java
index eb7de9b0a7d..5ba8508ce4c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentSampleRelationshipHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentSampleRelationshipHistoryTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentSampleTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentSampleTranslator.java
index b8f4315040a..406df0a006f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentSampleTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentSampleTranslator.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.asapi.v3.translator.experiment;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentTagTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentTagTranslator.java
index b3a202e012f..8977eacaab5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentTagTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentTagTranslator.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.asapi.v3.translator.experiment;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentTranslator.java
index eb0c40916dc..7edefd0ad6c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentTranslator.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.asapi.v3.translator.experiment;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentTypeBaseRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentTypeBaseRecord.java
index a411d40fca1..8d0d441b651 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentTypeBaseRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentTypeBaseRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentTypeBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentTypeBaseTranslator.java
index d5ad4c7cf59..9b9b8a185af 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentTypeBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentTypeBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentTypeRelationTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentTypeRelationTranslator.java
index 42572b7f963..ea2b61793d0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentTypeRelationTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentTypeRelationTranslator.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.asapi.v3.translator.experiment;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentTypeTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentTypeTranslator.java
index 4c26b22284d..dd98602196d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentTypeTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentTypeTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentTypeValidationPluginTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentTypeValidationPluginTranslator.java
index 1867f9e5322..992b8c11a89 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentTypeValidationPluginTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentTypeValidationPluginTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentUnknownRelationshipHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentUnknownRelationshipHistoryTranslator.java
index 82b764aded7..c313ef106c1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentUnknownRelationshipHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ExperimentUnknownRelationshipHistoryTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentAttachmentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentAttachmentTranslator.java
index 32bb7f05c31..b6a1c4b2ac6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentAttachmentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentAttachmentTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.attachment.IEntityAttachmentTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentAuthorizationValidator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentAuthorizationValidator.java
index 9f78f29e35a..e8c75e964ca 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentAuthorizationValidator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentAuthorizationValidator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectAuthorizationValidator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentBaseTranslator.java
index ceab2592e00..22599657b8d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectBaseTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentDataSetTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentDataSetTranslator.java
index 0d88c925095..a99baa12a54 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentDataSetTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentDataSetTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset.IObjectToDataSetsTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentHistoryTranslator.java
index 0689a118efe..f364b05906d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentHistoryTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.history.IHistoryTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentMaterialPropertyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentMaterialPropertyTranslator.java
index 0160437e696..336272b819f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentMaterialPropertyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentMaterialPropertyTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.property.IMaterialPropertyTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentModifierTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentModifierTranslator.java
index 6afb47e3a8b..abd37e81b39 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentModifierTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentModifierTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.person.IObjectToPersonTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentProjectTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentProjectTranslator.java
index c04b9e2fa32..493b2fcbd14 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentProjectTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentProjectTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.project.IObjectToProjectTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentPropertyAssignmentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentPropertyAssignmentTranslator.java
index b68ec2d71e6..b27b9406bca 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentPropertyAssignmentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentPropertyAssignmentTranslator.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.asapi.v3.translator.experiment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.PropertyAssignment;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentPropertyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentPropertyTranslator.java
index 2b1fce7508a..4aedb65580b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentPropertyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentPropertyTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.property.IPropertyTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentRegistratorTranslator.java
index 86c4908e62b..7b7f5e7a107 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentRegistratorTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.person.IObjectToPersonTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentSamplePropertyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentSamplePropertyTranslator.java
index 1b28241535a..43271c900ed 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentSamplePropertyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentSamplePropertyTranslator.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.asapi.v3.translator.experiment;
 
 public interface IExperimentSamplePropertyTranslator
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentSampleTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentSampleTranslator.java
index bc0bb95f41d..036c7c2e06f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentSampleTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentSampleTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.sample.IObjectToSamplesTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentTagTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentTagTranslator.java
index 9d37b7fdeeb..1321de43ad9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentTagTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentTagTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.tag.IObjectToTagsTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentTranslator.java
index bff5fe65750..2ac3c078bc8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.Experiment;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentTypeBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentTypeBaseTranslator.java
index 29c4eb5999e..fe817fc1bdc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentTypeBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentTypeBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectBaseTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentTypeRelationTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentTypeRelationTranslator.java
index fbad60217de..5f748256903 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentTypeRelationTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentTypeRelationTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.ExperimentType;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentTypeTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentTypeTranslator.java
index 09c3804ee4a..496abefdbd7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentTypeTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentTypeTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.ExperimentType;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentTypeValidationPluginTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentTypeValidationPluginTranslator.java
index d3dfa0ec920..4453fa8d823 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentTypeValidationPluginTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IExperimentTypeValidationPluginTranslator.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.asapi.v3.translator.experiment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.plugin.IObjectToPluginTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IObjectToExperimentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IObjectToExperimentTranslator.java
index 9f3f95867ce..5392af886f0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IObjectToExperimentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IObjectToExperimentTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.Experiment;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IObjectToExperimentsTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IObjectToExperimentsTranslator.java
index 6c42de9c147..2877ce6503b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IObjectToExperimentsTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/IObjectToExperimentsTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.Experiment;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ObjectToExperimentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ObjectToExperimentTranslator.java
index 2edffc4fa22..b58507adb58 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ObjectToExperimentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ObjectToExperimentTranslator.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.asapi.v3.translator.experiment;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ObjectToExperimentsTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ObjectToExperimentsTranslator.java
index 416bd3cedc8..f1e0e42050f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ObjectToExperimentsTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/ObjectToExperimentsTranslator.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.asapi.v3.translator.experiment;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/search/ExperimentAttributeProvider.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/search/ExperimentAttributeProvider.java
index cdb5ad84f6d..45c45b0b218 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/search/ExperimentAttributeProvider.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/search/ExperimentAttributeProvider.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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment.search;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExperimentAttributeSearchFieldKind.CODE;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/search/ExperimentSearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/search/ExperimentSearchCriteriaTranslator.java
index 3d9522aefaa..aa5cb59a30d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/search/ExperimentSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/experiment/search/ExperimentSearchCriteriaTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/ExternalDmsBaseRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/ExternalDmsBaseRecord.java
index 7365c4264b6..530ea0da486 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/ExternalDmsBaseRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/ExternalDmsBaseRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.externaldms;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.ObjectBaseRecord;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/ExternalDmsBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/ExternalDmsBaseTranslator.java
index d824a9d4910..8e7ebec98b8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/ExternalDmsBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/ExternalDmsBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.externaldms;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/ExternalDmsQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/ExternalDmsQuery.java
index b1ade14d95b..d3efcb934fb 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/ExternalDmsQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/ExternalDmsQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.asapi.v3.translator.externaldms;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/ExternalDmsTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/ExternalDmsTranslator.java
index 8066b7742f7..29c4145587f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/ExternalDmsTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/ExternalDmsTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.translator.externaldms;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/IExternalDmsBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/IExternalDmsBaseTranslator.java
index 080e1ac121b..30a10aa3578 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/IExternalDmsBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/IExternalDmsBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.externaldms;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectBaseTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/IExternalDmsTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/IExternalDmsTranslator.java
index e1f51706279..49ebd41155f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/IExternalDmsTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/IExternalDmsTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.externaldms;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.externaldms.ExternalDms;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/search/ExternalDmsAttributeProvider.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/search/ExternalDmsAttributeProvider.java
index 68b946663bc..f1fcbc5e6e1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/search/ExternalDmsAttributeProvider.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/search/ExternalDmsAttributeProvider.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.ethz.sis.openbis.generic.server.asapi.v3.translator.externaldms.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.CodeSearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/search/ExternalDmsSearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/search/ExternalDmsSearchCriteriaTranslator.java
index a2a0440e159..f67fa0b7855 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/search/ExternalDmsSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/externaldms/search/ExternalDmsSearchCriteriaTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.externaldms.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/globalsearch/GlobalSearchObjectTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/globalsearch/GlobalSearchObjectTranslator.java
index 9ff3f8f5efe..652d9545d8a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/globalsearch/GlobalSearchObjectTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/globalsearch/GlobalSearchObjectTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.asapi.v3.translator.globalsearch;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/globalsearch/IGlobalSearchObjectTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/globalsearch/IGlobalSearchObjectTranslator.java
index c058e85fef7..2382fdd7734 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/globalsearch/IGlobalSearchObjectTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/globalsearch/IGlobalSearchObjectTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.globalsearch;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.global.GlobalSearchObject;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/HistoryContentCopyRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/HistoryContentCopyRecord.java
index 82c018b0003..e6a423eb684 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/HistoryContentCopyRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/HistoryContentCopyRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.history;
 
 public class HistoryContentCopyRecord extends HistoryRecord
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/HistoryPropertyRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/HistoryPropertyRecord.java
index d9f0fd2a6f7..94b86c82741 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/HistoryPropertyRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/HistoryPropertyRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.history;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/HistoryRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/HistoryRecord.java
index 2d741fdf47e..525f1d4ef87 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/HistoryRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/HistoryRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.history;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/HistoryRelationshipRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/HistoryRelationshipRecord.java
index e8a96bfd606..c9c1814d7b5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/HistoryRelationshipRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/HistoryRelationshipRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.history;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/HistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/HistoryTranslator.java
index 5fd98304f33..954795489d4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/HistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/HistoryTranslator.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.asapi.v3.translator.history;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/IHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/IHistoryTranslator.java
index 7e49db6360e..282ba4de83b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/IHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/IHistoryTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.history;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/PropertyHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/PropertyHistoryTranslator.java
index 113c3723a38..71a7d39a1c1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/PropertyHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/PropertyHistoryTranslator.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.asapi.v3.translator.history;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/RelationshipHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/RelationshipHistoryTranslator.java
index b0304d22457..022543d692b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/RelationshipHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/history/RelationshipHistoryTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.translator.history;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialBaseTranslator.java
index db8764ce960..b120d96bffe 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.material;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectBaseTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialHistoryTranslator.java
index 8cd308aa4fb..7cf19760c2a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialHistoryTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.material;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.history.IHistoryTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialMaterialPropertyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialMaterialPropertyTranslator.java
index b7ac06d5a1a..0488193a05a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialMaterialPropertyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialMaterialPropertyTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.material;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.property.IMaterialPropertyTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialPropertyAssignmentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialPropertyAssignmentTranslator.java
index f5f2dd79755..9b7a3fec2d8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialPropertyAssignmentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialPropertyAssignmentTranslator.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.asapi.v3.translator.material;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.PropertyAssignment;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialPropertyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialPropertyTranslator.java
index d800520a36b..a6298a16c26 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialPropertyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialPropertyTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.material;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.property.IPropertyTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialRegistratorTranslator.java
index 7a6850ce8ab..27a1ec3d624 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialRegistratorTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.material;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.person.IObjectToPersonTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialTagTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialTagTranslator.java
index 9c98346d6fc..31d7d36b55f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialTagTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialTagTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.material;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.tag.IObjectToTagsTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialTranslator.java
index 21515c24d33..b2bc7c83ff4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.material;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.Material;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialTypeBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialTypeBaseTranslator.java
index 3aafbbd6010..8798bb496b6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialTypeBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialTypeBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.material;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectBaseTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialTypeRelationTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialTypeRelationTranslator.java
index 2830ef3a284..88f80100aad 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialTypeRelationTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialTypeRelationTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.material;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.MaterialType;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialTypeTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialTypeTranslator.java
index bd692c15c40..40b500c16c1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialTypeTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialTypeTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.material;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.MaterialType;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialTypeValidationPluginTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialTypeValidationPluginTranslator.java
index 91496c1a439..1dbea22186d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialTypeValidationPluginTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IMaterialTypeValidationPluginTranslator.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.asapi.v3.translator.material;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.plugin.IObjectToPluginTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IObjectToMaterialsTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IObjectToMaterialsTranslator.java
index 2c9f77c6f60..de05c1cacf1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IObjectToMaterialsTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/IObjectToMaterialsTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.material;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.Material;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialBaseRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialBaseRecord.java
index 4f1050f3fe2..8010a4008e6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialBaseRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialBaseRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.material;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialBaseTranslator.java
index 8c4324a71b8..6c0abff7306 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.material;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialHistoryTranslator.java
index 357a255dc91..2ac778eb5ea 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialHistoryTranslator.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.asapi.v3.translator.material;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialMaterialPropertyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialMaterialPropertyTranslator.java
index 177efcd8846..4f787f4b885 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialMaterialPropertyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialMaterialPropertyTranslator.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.asapi.v3.translator.material;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialPropertyAssignmentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialPropertyAssignmentTranslator.java
index 813e752bbf4..b81a29f506c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialPropertyAssignmentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialPropertyAssignmentTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.translator.material;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialPropertyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialPropertyTranslator.java
index 1b6159a40f1..cc91fb434b5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialPropertyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialPropertyTranslator.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.asapi.v3.translator.material;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialQuery.java
index 553402014b3..e4d15118f79 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.asapi.v3.translator.material;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialRegistratorTranslator.java
index c16bc76246d..0f4937a25e8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialRegistratorTranslator.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.asapi.v3.translator.material;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialTagTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialTagTranslator.java
index 7ec5b892cae..ea09f5868e9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialTagTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialTagTranslator.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.asapi.v3.translator.material;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialTranslator.java
index d5f0b7954b3..76f7c54f744 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.asapi.v3.translator.material;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialTypeBaseRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialTypeBaseRecord.java
index 48668e808eb..7fb2e917239 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialTypeBaseRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialTypeBaseRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.material;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialTypeBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialTypeBaseTranslator.java
index d9d93b48008..29a5b14f291 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialTypeBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialTypeBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.material;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialTypeRelationTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialTypeRelationTranslator.java
index 3d20b5a539a..c4a31c4105d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialTypeRelationTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialTypeRelationTranslator.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.asapi.v3.translator.material;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialTypeTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialTypeTranslator.java
index 9446911d528..9ec8fa6a23d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialTypeTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialTypeTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.material;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialTypeValidationPluginTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialTypeValidationPluginTranslator.java
index 9ef825bf6a8..635d6326c28 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialTypeValidationPluginTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/MaterialTypeValidationPluginTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 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.ethz.sis.openbis.generic.server.asapi.v3.translator.material;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/ObjectToMaterialsTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/ObjectToMaterialsTranslator.java
index 41221413ebe..0ef37f654c7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/ObjectToMaterialsTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/ObjectToMaterialsTranslator.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.asapi.v3.translator.material;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/search/MaterialAttributeProvider.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/search/MaterialAttributeProvider.java
index de6a08534d8..23ffc78e806 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/search/MaterialAttributeProvider.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/search/MaterialAttributeProvider.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.ethz.sis.openbis.generic.server.asapi.v3.translator.material.search;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.MaterialAttributeSearchFieldKind.ID;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/search/MaterialSearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/search/MaterialSearchCriteriaTranslator.java
index b7e71383aa9..fb77c3681a8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/search/MaterialSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/material/search/MaterialSearchCriteriaTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.material.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/pat/IPersonalAccessTokenTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/pat/IPersonalAccessTokenTranslator.java
index b29f92de277..47d789d77f9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/pat/IPersonalAccessTokenTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/pat/IPersonalAccessTokenTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.pat;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.pat.fetchoptions.PersonalAccessTokenFetchOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/pat/PersonalAccessTokenTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/pat/PersonalAccessTokenTranslator.java
index fa4517f80f6..ab724b33386 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/pat/PersonalAccessTokenTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/pat/PersonalAccessTokenTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 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.ethz.sis.openbis.generic.server.asapi.v3.translator.pat;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/IObjectToPersonTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/IObjectToPersonTranslator.java
index 82e633ab539..3802f369f26 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/IObjectToPersonTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/IObjectToPersonTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.person;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.Person;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/IPersonBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/IPersonBaseTranslator.java
index 07baa00c649..23f3a08de80 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/IPersonBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/IPersonBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.person;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectBaseTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/IPersonRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/IPersonRegistratorTranslator.java
index 32ff91ccebd..23474d0ae96 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/IPersonRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/IPersonRegistratorTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.person;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/IPersonRoleAssignmentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/IPersonRoleAssignmentTranslator.java
index 72fdd201d7a..4c3c910642b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/IPersonRoleAssignmentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/IPersonRoleAssignmentTranslator.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.asapi.v3.translator.person;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.roleassignment.RoleAssignment;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/IPersonSpaceTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/IPersonSpaceTranslator.java
index a80b8eee525..ffe53e224ae 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/IPersonSpaceTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/IPersonSpaceTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.person;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.space.IObjectToSpaceTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/IPersonTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/IPersonTranslator.java
index 3e5cb5c0d78..ca28a2cc540 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/IPersonTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/IPersonTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.person;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.Person;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/IPersonWebAppSettingsTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/IPersonWebAppSettingsTranslator.java
index 78adae6cbb2..f641b95160b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/IPersonWebAppSettingsTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/IPersonWebAppSettingsTranslator.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.asapi.v3.translator.person;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/ObjectToPersonTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/ObjectToPersonTranslator.java
index c739b885a0e..a538238f2c6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/ObjectToPersonTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/ObjectToPersonTranslator.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.asapi.v3.translator.person;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonBaseRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonBaseRecord.java
index 8580f6fa278..194f91368e9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonBaseRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonBaseRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.person;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonBaseTranslator.java
index c32cf254cc1..ba3711b70cf 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.person;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonQuery.java
index 116dff6ff97..cd96a0f8a66 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.asapi.v3.translator.person;
 
 import it.unimi.dsi.fastutil.longs.LongSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonRegistratorTranslator.java
index 0734aff278f..ff9fe29c69c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonRegistratorTranslator.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.asapi.v3.translator.person;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonRoleAssignmentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonRoleAssignmentTranslator.java
index 7c9e32449c9..96db5ace5c5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonRoleAssignmentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonRoleAssignmentTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 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.ethz.sis.openbis.generic.server.asapi.v3.translator.person;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonSpaceTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonSpaceTranslator.java
index a82305c1765..e7cc4eb14a2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonSpaceTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonSpaceTranslator.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.asapi.v3.translator.person;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonTranslator.java
index 1229d982d7b..fd73ae0d68e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.person;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonWebAppSettingsTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonWebAppSettingsTranslator.java
index d3eae7ded07..8429332fdfd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonWebAppSettingsTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/PersonWebAppSettingsTranslator.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.asapi.v3.translator.person;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/search/ModifierSearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/search/ModifierSearchCriteriaTranslator.java
index a6ca2e9b65f..ac1a0b29517 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/search/ModifierSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/search/ModifierSearchCriteriaTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.person.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/search/PersonSearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/search/PersonSearchCriteriaTranslator.java
index d5f95636b8d..517fdfad7b4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/search/PersonSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/search/PersonSearchCriteriaTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.ethz.sis.openbis.generic.server.asapi.v3.translator.person.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/search/RegistratorSearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/search/RegistratorSearchCriteriaTranslator.java
index 05bddc6cb3d..326c6ca41fb 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/search/RegistratorSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/person/search/RegistratorSearchCriteriaTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.person.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/IObjectToPluginTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/IObjectToPluginTranslator.java
index fc7646e43da..61f37e9a103 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/IObjectToPluginTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/IObjectToPluginTranslator.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.asapi.v3.translator.plugin;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.plugin.Plugin;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/IPluginBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/IPluginBaseTranslator.java
index 86b84c1ce82..933fd4a4585 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/IPluginBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/IPluginBaseTranslator.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.asapi.v3.translator.plugin;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectBaseTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/IPluginRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/IPluginRegistratorTranslator.java
index 43ab648316c..d33f8a7de3f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/IPluginRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/IPluginRegistratorTranslator.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.asapi.v3.translator.plugin;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.Person;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/IPluginTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/IPluginTranslator.java
index bf10d55f881..246a5e37845 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/IPluginTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/IPluginTranslator.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.asapi.v3.translator.plugin;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.plugin.Plugin;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/ObjectToPluginTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/ObjectToPluginTranslator.java
index 93ed68b8717..f6930531619 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/ObjectToPluginTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/ObjectToPluginTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 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.ethz.sis.openbis.generic.server.asapi.v3.translator.plugin;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/PluginBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/PluginBaseTranslator.java
index 42bae1f1368..2b8d8b967ef 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/PluginBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/PluginBaseTranslator.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.asapi.v3.translator.plugin;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/PluginQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/PluginQuery.java
index 22b9b8d0c16..9de6869b8ad 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/PluginQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/PluginQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 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.ethz.sis.openbis.generic.server.asapi.v3.translator.plugin;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/PluginRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/PluginRecord.java
index 9642759ca5d..ae2e3509da1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/PluginRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/PluginRecord.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.asapi.v3.translator.plugin;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/PluginRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/PluginRegistratorTranslator.java
index 2f03b06887e..e7fcc963208 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/PluginRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/PluginRegistratorTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 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.ethz.sis.openbis.generic.server.asapi.v3.translator.plugin;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/PluginTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/PluginTranslator.java
index a392fab3e1f..0fb54350ae5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/PluginTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/plugin/PluginTranslator.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.asapi.v3.translator.plugin;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IObjectToProjectTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IObjectToProjectTranslator.java
index 8f248e471ab..5941129fabe 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IObjectToProjectTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IObjectToProjectTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.project;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.project.Project;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IObjectToProjectsTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IObjectToProjectsTranslator.java
index 7c9c7e40003..5d47f33f02a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IObjectToProjectsTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IObjectToProjectsTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.project;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.project.Project;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectAttachmentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectAttachmentTranslator.java
index 477d84e16f6..928ec7018ee 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectAttachmentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectAttachmentTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.project;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.attachment.IEntityAttachmentTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectAuthorizationValidator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectAuthorizationValidator.java
index 5f15e003c65..2e6dad6cc82 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectAuthorizationValidator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectAuthorizationValidator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.project;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectAuthorizationValidator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectBaseTranslator.java
index 5c91cf22ca7..3578145590b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.project;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectBaseTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectExperimentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectExperimentTranslator.java
index e6ea0966a44..28ba671a3a6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectExperimentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectExperimentTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.project;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment.IObjectToExperimentsTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectHistoryTranslator.java
index 63990324572..203db8de0dc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectHistoryTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.project;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.history.IHistoryTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectLeaderTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectLeaderTranslator.java
index c36854855d4..1658114dc55 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectLeaderTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectLeaderTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.project;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.person.IObjectToPersonTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectModifierTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectModifierTranslator.java
index 7aa8072c7e9..d91a1224fd6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectModifierTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectModifierTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.project;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.person.IObjectToPersonTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectRegistratorTranslator.java
index 584d020f9b5..58adde2af2d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectRegistratorTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.project;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.person.IObjectToPersonTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectSampleTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectSampleTranslator.java
index 8492d9698f2..9204eeb08da 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectSampleTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectSampleTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.project;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.sample.IObjectToSamplesTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectSpaceTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectSpaceTranslator.java
index ee8200c10b9..81ff45c1739 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectSpaceTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectSpaceTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.project;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.space.IObjectToSpaceTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectTranslator.java
index cb556d70e96..1c80c33bad1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/IProjectTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.project;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.project.Project;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ObjectToProjectTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ObjectToProjectTranslator.java
index dfa84f5cdac..54f64fb0e2a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ObjectToProjectTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ObjectToProjectTranslator.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.asapi.v3.translator.project;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ObjectToProjectsTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ObjectToProjectsTranslator.java
index e777df58b98..6a5f1ad22b5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ObjectToProjectsTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ObjectToProjectsTranslator.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.asapi.v3.translator.project;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectAttachmentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectAttachmentTranslator.java
index 3259a689f90..35394cfb336 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectAttachmentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectAttachmentTranslator.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.asapi.v3.translator.project;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectAuthorizationRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectAuthorizationRecord.java
index 7ef8697c0d5..862923ce339 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectAuthorizationRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectAuthorizationRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.project;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectAuthorizationValidator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectAuthorizationValidator.java
index d2383679602..d248fadaa8f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectAuthorizationValidator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectAuthorizationValidator.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.asapi.v3.translator.project;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectBaseRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectBaseRecord.java
index d5204d6df87..fd9ba55b6d3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectBaseRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectBaseRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.project;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectBaseTranslator.java
index 3f669c87cb3..d50423a7db8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.project;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectExperimentRelationshipHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectExperimentRelationshipHistoryTranslator.java
index 9c5f5e22941..dfcd9e3ab9c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectExperimentRelationshipHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectExperimentRelationshipHistoryTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.project;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectExperimentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectExperimentTranslator.java
index 10438dd551a..3e54fee335c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectExperimentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectExperimentTranslator.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.asapi.v3.translator.project;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectHistoryTranslator.java
index e3b4879419b..84c3ef972f4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectHistoryTranslator.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.asapi.v3.translator.project;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectLeaderTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectLeaderTranslator.java
index 34ba1a89368..328bf2d68a9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectLeaderTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectLeaderTranslator.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.asapi.v3.translator.project;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectModifierTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectModifierTranslator.java
index c5b20124696..d852688d7f9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectModifierTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectModifierTranslator.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.asapi.v3.translator.project;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectQuery.java
index fcd0acc06bc..b0c6ec9046f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.asapi.v3.translator.project;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectRegistratorTranslator.java
index 3009ec921b3..0bc505e2828 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectRegistratorTranslator.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.asapi.v3.translator.project;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectRelationshipHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectRelationshipHistoryTranslator.java
index f7c4f5d4057..bd6a365515b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectRelationshipHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectRelationshipHistoryTranslator.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.asapi.v3.translator.project;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectRelationshipRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectRelationshipRecord.java
index 403c7a3a289..0166d59f685 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectRelationshipRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectRelationshipRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.project;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.history.HistoryRelationshipRecord;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectSampleRelationshipHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectSampleRelationshipHistoryTranslator.java
index cf7b269bee7..8c703ca1612 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectSampleRelationshipHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectSampleRelationshipHistoryTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.project;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectSampleTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectSampleTranslator.java
index e12c7b25cfc..1e21e64c69f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectSampleTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectSampleTranslator.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.asapi.v3.translator.project;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectSpaceRelationshipHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectSpaceRelationshipHistoryTranslator.java
index 4251a8cdd9d..a2835e7261a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectSpaceRelationshipHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectSpaceRelationshipHistoryTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.translator.project;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectSpaceTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectSpaceTranslator.java
index 37fa8267659..b5439dcb1d7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectSpaceTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectSpaceTranslator.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.asapi.v3.translator.project;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectTranslator.java
index f23c74bf46d..e142019f0f8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectTranslator.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.asapi.v3.translator.project;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectUnknownRelationshipHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectUnknownRelationshipHistoryTranslator.java
index 5bdd969c167..29520d73151 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectUnknownRelationshipHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/ProjectUnknownRelationshipHistoryTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.project;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/search/ProjectSearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/search/ProjectSearchCriteriaTranslator.java
index ce41beec881..141d44db1e3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/search/ProjectSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/project/search/ProjectSearchCriteriaTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.project.search;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IMaterialPropertyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IMaterialPropertyTranslator.java
index b31748aaac9..64f442e14fc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IMaterialPropertyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IMaterialPropertyTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.property;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyAssignmentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyAssignmentTranslator.java
index 290fc7771c1..63560786a6d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyAssignmentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyAssignmentTranslator.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.asapi.v3.translator.property;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTranslator.java
index 8eb4ce1ee7b..5ff51ae5c5c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.property;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTypeBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTypeBaseTranslator.java
index c90425aa7b7..8fc935f0ed7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTypeBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTypeBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.property;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectBaseTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTypeMaterialTypeTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTypeMaterialTypeTranslator.java
index 8887e9bfb3c..5488e2b478e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTypeMaterialTypeTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTypeMaterialTypeTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.property;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.material.MaterialType;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTypeRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTypeRegistratorTranslator.java
index 93aa917a8d2..4a0f030d0ed 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTypeRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTypeRegistratorTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.property;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.Person;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTypeSampleTypeTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTypeSampleTypeTranslator.java
index faf60664928..20c734cb369 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTypeSampleTypeTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTypeSampleTypeTranslator.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.asapi.v3.translator.property;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.SampleType;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTypeSemanticAnnotationTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTypeSemanticAnnotationTranslator.java
index 43da6fd0dcf..15955eff3eb 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTypeSemanticAnnotationTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTypeSemanticAnnotationTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.property;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.semanticannotation.SemanticAnnotation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTypeTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTypeTranslator.java
index 4081d9b18f3..f276de1dacf 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTypeTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTypeTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.property;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.PropertyType;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTypeVocabularyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTypeVocabularyTranslator.java
index 663de2e1964..ef28effedc2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTypeVocabularyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/IPropertyTypeVocabularyTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.property;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.Vocabulary;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/ISamplePropertyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/ISamplePropertyTranslator.java
index dd48db219df..96692184c5c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/ISamplePropertyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/ISamplePropertyTranslator.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.asapi.v3.translator.property;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/MaterialPropertyRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/MaterialPropertyRecord.java
index 2222f0e97af..be0c28a2e4e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/MaterialPropertyRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/MaterialPropertyRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.property;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/MaterialPropertyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/MaterialPropertyTranslator.java
index 6941d3a74e1..e2f14840f6a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/MaterialPropertyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/MaterialPropertyTranslator.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.asapi.v3.translator.property;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyAssignmentKey.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyAssignmentKey.java
index fe7bb0336a3..82c63ba6fb5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyAssignmentKey.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyAssignmentKey.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.ethz.sis.openbis.generic.server.asapi.v3.translator.property;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.EntityKind;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyAssignmentRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyAssignmentRecord.java
index 84b3162e957..560d861811e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyAssignmentRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyAssignmentRecord.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.asapi.v3.translator.property;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyAssignmentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyAssignmentTranslator.java
index 7d23935faf4..d69a5bba217 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyAssignmentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyAssignmentTranslator.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.asapi.v3.translator.property;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyQueryGenerator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyQueryGenerator.java
index eae35b03175..a4af22b3649 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyQueryGenerator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyQueryGenerator.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.asapi.v3.translator.property;
 
 import org.apache.commons.lang3.StringUtils;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyRecord.java
index 864b7096486..f59955e26b1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.property;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTranslator.java
index 473002a1a7e..33ffc10d2de 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTranslator.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.asapi.v3.translator.property;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeBaseTranslator.java
index 267f5035731..3bb08e4213e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.property;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeMaterialTypeTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeMaterialTypeTranslator.java
index db1bad869ea..00927a6ba80 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeMaterialTypeTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeMaterialTypeTranslator.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.asapi.v3.translator.property;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeQuery.java
index 6afd9ef8073..b9abf77b48a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.translator.property;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeRecord.java
index 8bad367cf8d..237c63570f9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeRecord.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.asapi.v3.translator.property;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeRegistratorTranslator.java
index 5ea801348af..4e4455c9a0b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeRegistratorTranslator.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.asapi.v3.translator.property;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeSampleTypeTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeSampleTypeTranslator.java
index b2fb8539f54..ce94437bc49 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeSampleTypeTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeSampleTypeTranslator.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.asapi.v3.translator.property;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeSemanticAnnotationTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeSemanticAnnotationTranslator.java
index e8421c9c4d6..9ada29417ba 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeSemanticAnnotationTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeSemanticAnnotationTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.translator.property;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeTranslator.java
index 1a89af1b047..dd33af9a3a4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeTranslator.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.server.asapi.v3.translator.property;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeVocabularyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeVocabularyTranslator.java
index f582e51dc44..663d273acdb 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeVocabularyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/PropertyTypeVocabularyTranslator.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.asapi.v3.translator.property;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/SamplePropertyRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/SamplePropertyRecord.java
index 2a1ce58ce3d..8a364867cd0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/SamplePropertyRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/SamplePropertyRecord.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.asapi.v3.translator.property;
 
 public class SamplePropertyRecord
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/SamplePropertyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/SamplePropertyTranslator.java
index 7390fa016ab..83a9dffceb9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/SamplePropertyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/property/SamplePropertyTranslator.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.asapi.v3.translator.property;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/IQueryAuthorizationValidator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/IQueryAuthorizationValidator.java
index b7df71f8c7a..a830ede8505 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/IQueryAuthorizationValidator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/IQueryAuthorizationValidator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.query;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectAuthorizationValidator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/IQueryBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/IQueryBaseTranslator.java
index 5ac26afecc4..5af9bd305e0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/IQueryBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/IQueryBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.query;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectBaseTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/IQueryDatabaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/IQueryDatabaseTranslator.java
index bd05a2f4667..64b7aac04f4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/IQueryDatabaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/IQueryDatabaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.query;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.query.QueryDatabase;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/IQueryRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/IQueryRegistratorTranslator.java
index 0a951c6adb7..8c4bef13ceb 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/IQueryRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/IQueryRegistratorTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.query;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.person.IObjectToPersonTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/IQueryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/IQueryTranslator.java
index 9d2ae9649b8..5741d5153f5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/IQueryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/IQueryTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.query;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.query.Query;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryAuthorizationRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryAuthorizationRecord.java
index c33cdcb891d..f4c0c86faf4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryAuthorizationRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryAuthorizationRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.query;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryAuthorizationValidator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryAuthorizationValidator.java
index 728e63aafb5..768d330438e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryAuthorizationValidator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryAuthorizationValidator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.query;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryBaseRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryBaseRecord.java
index 2d581f8d28c..240eea88871 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryBaseRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryBaseRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.query;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryBaseTranslator.java
index cb735d01802..a19fd69c9a9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.query;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryDatabaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryDatabaseTranslator.java
index a262d6466be..cf7743768c9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryDatabaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryDatabaseTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * 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.asapi.v3.translator.query;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryQuery.java
index f87a63d47e0..ebe5c2981db 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.asapi.v3.translator.query;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryRegistratorTranslator.java
index 7190252dc5b..4a2e61be49e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryRegistratorTranslator.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.asapi.v3.translator.query;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryTranslator.java
index e1276238ac6..b1dac8c6866 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/query/QueryTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 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.asapi.v3.translator.query;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/IRoleAssignmentAuthorizationGroupTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/IRoleAssignmentAuthorizationGroupTranslator.java
index e3032f7d71c..425ca92d2d3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/IRoleAssignmentAuthorizationGroupTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/IRoleAssignmentAuthorizationGroupTranslator.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.asapi.v3.translator.roleassignment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.authorizationgroup.IObjectToAuthorizationGroupTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/IRoleAssignmentBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/IRoleAssignmentBaseTranslator.java
index 2db1fe95e0e..0f85a42595b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/IRoleAssignmentBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/IRoleAssignmentBaseTranslator.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.asapi.v3.translator.roleassignment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectBaseTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/IRoleAssignmentPersonTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/IRoleAssignmentPersonTranslator.java
index ed354560921..508af388489 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/IRoleAssignmentPersonTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/IRoleAssignmentPersonTranslator.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.asapi.v3.translator.roleassignment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.person.IObjectToPersonTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/IRoleAssignmentProjectTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/IRoleAssignmentProjectTranslator.java
index ef9d66f8c65..6bd8eb8fe9f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/IRoleAssignmentProjectTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/IRoleAssignmentProjectTranslator.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.asapi.v3.translator.roleassignment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.project.IObjectToProjectTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/IRoleAssignmentRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/IRoleAssignmentRegistratorTranslator.java
index a27c2230a3b..694863e4291 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/IRoleAssignmentRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/IRoleAssignmentRegistratorTranslator.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.asapi.v3.translator.roleassignment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.person.IObjectToPersonTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/IRoleAssignmentSpaceTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/IRoleAssignmentSpaceTranslator.java
index 6e6a04a789b..40e04bd66e2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/IRoleAssignmentSpaceTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/IRoleAssignmentSpaceTranslator.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.asapi.v3.translator.roleassignment;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.space.IObjectToSpaceTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/IRoleAssignmentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/IRoleAssignmentTranslator.java
index ca1948f72fb..e73be63d0c0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/IRoleAssignmentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/IRoleAssignmentTranslator.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.asapi.v3.translator.roleassignment;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.roleassignment.RoleAssignment;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentAuthorizationGroupTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentAuthorizationGroupTranslator.java
index 301d756df17..bb84d9306b5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentAuthorizationGroupTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentAuthorizationGroupTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 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.ethz.sis.openbis.generic.server.asapi.v3.translator.roleassignment;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentBaseRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentBaseRecord.java
index fc3b0540ea1..675a1fd18b3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentBaseRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentBaseRecord.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.asapi.v3.translator.roleassignment;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentBaseTranslator.java
index 7bf37cb1d4c..81c45aa08a4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentBaseTranslator.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.asapi.v3.translator.roleassignment;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentPersonTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentPersonTranslator.java
index 9aaf01257e9..a43dd959952 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentPersonTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentPersonTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 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.ethz.sis.openbis.generic.server.asapi.v3.translator.roleassignment;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentProjectTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentProjectTranslator.java
index 35f407c321b..548c7129171 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentProjectTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentProjectTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 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.ethz.sis.openbis.generic.server.asapi.v3.translator.roleassignment;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentQuery.java
index d1ef6cda7cf..568a582072b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentQuery.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.asapi.v3.translator.roleassignment;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentRegistratorTranslator.java
index 5e285e23e94..f51f4d11437 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentRegistratorTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 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.ethz.sis.openbis.generic.server.asapi.v3.translator.roleassignment;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentSpaceTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentSpaceTranslator.java
index e43f746cdf8..4ffb2d17993 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentSpaceTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentSpaceTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 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.ethz.sis.openbis.generic.server.asapi.v3.translator.roleassignment;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentTranslator.java
index 1c643c58d61..e9df839b416 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/roleassignment/RoleAssignmentTranslator.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.asapi.v3.translator.roleassignment;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/IObjectToSampleTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/IObjectToSampleTranslator.java
index ccc8e596acc..66e53d1fc46 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/IObjectToSampleTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/IObjectToSampleTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.Sample;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/IObjectToSamplesTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/IObjectToSamplesTranslator.java
index da53576e80a..02ae5bc4885 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/IObjectToSamplesTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/IObjectToSamplesTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.fetchoptions.SampleFetchOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleAttachmentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleAttachmentTranslator.java
index 8daceb38dd3..f621d27c997 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleAttachmentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleAttachmentTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.attachment.IEntityAttachmentTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleAuthorizationValidator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleAuthorizationValidator.java
index a61eadde093..4725e0d5f04 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleAuthorizationValidator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleAuthorizationValidator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectAuthorizationValidator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleBaseTranslator.java
index 959ea068ca1..046e8b15a7c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectBaseTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleChildTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleChildTranslator.java
index 42cbaae3d6a..26c1c42effd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleChildTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleChildTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleComponentsTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleComponentsTranslator.java
index 10c1378bce9..4db2ecb3f53 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleComponentsTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleComponentsTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleContainerTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleContainerTranslator.java
index d5f1b9d0fcb..935bd51f6d0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleContainerTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleContainerTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleDataSetTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleDataSetTranslator.java
index 637bc5fb00f..37c05fc5fed 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleDataSetTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleDataSetTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset.IObjectToDataSetsTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleExperimentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleExperimentTranslator.java
index f56fd6d0496..aae65c885d4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleExperimentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleExperimentTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment.IObjectToExperimentTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleHistoryTranslator.java
index 9bfbc2ef114..6a3b8b2a50c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleHistoryTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.history.IHistoryTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleMaterialPropertyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleMaterialPropertyTranslator.java
index ed666b0692f..4a0bcb20037 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleMaterialPropertyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleMaterialPropertyTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.property.IMaterialPropertyTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleModifierTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleModifierTranslator.java
index 98988c3fd34..e76c094a8a5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleModifierTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleModifierTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.person.IObjectToPersonTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleParentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleParentTranslator.java
index 8e9c40b78d5..51629e955b8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleParentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleParentTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleProjectTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleProjectTranslator.java
index 1c3785c8859..448ea7ac354 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleProjectTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleProjectTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.project.IObjectToProjectTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISamplePropertyAssignmentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISamplePropertyAssignmentTranslator.java
index 7d0d76b3bb7..18ad2cb0310 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISamplePropertyAssignmentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISamplePropertyAssignmentTranslator.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.asapi.v3.translator.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.PropertyAssignment;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISamplePropertyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISamplePropertyTranslator.java
index ed3ce7b90df..8b7d05a2d6e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISamplePropertyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISamplePropertyTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.property.IPropertyTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleRegistratorTranslator.java
index e79496c8b66..d1f008bb3f9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleRegistratorTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.person.IObjectToPersonTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleSamplePropertyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleSamplePropertyTranslator.java
index 67b95103b76..53f65198ddc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleSamplePropertyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleSamplePropertyTranslator.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.asapi.v3.translator.sample;
 
 public interface ISampleSamplePropertyTranslator
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleSpaceTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleSpaceTranslator.java
index 5a016040279..67d18b2003b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleSpaceTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleSpaceTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.space.IObjectToSpaceTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleTagTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleTagTranslator.java
index 34fac3ce676..aff269d20db 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleTagTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleTagTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.tag.IObjectToTagsTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleTranslator.java
index ad76029a441..059a12e470e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.Sample;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleTypeBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleTypeBaseTranslator.java
index 459d85da1ad..5871854d008 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleTypeBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleTypeBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectBaseTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleTypeRelationTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleTypeRelationTranslator.java
index d306b8a7f96..fa1c7b34c8e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleTypeRelationTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleTypeRelationTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.SampleType;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleTypeSemanticAnnotationTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleTypeSemanticAnnotationTranslator.java
index 843078143f1..08777b55057 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleTypeSemanticAnnotationTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleTypeSemanticAnnotationTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.semanticannotation.SemanticAnnotation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleTypeTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleTypeTranslator.java
index 2282062c565..d5ba2396d71 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleTypeTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleTypeTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.SampleType;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleTypeValidationPluginTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleTypeValidationPluginTranslator.java
index 35444df2830..de646c05dc0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleTypeValidationPluginTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ISampleTypeValidationPluginTranslator.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.asapi.v3.translator.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.plugin.IObjectToPluginTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ObjectToSampleTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ObjectToSampleTranslator.java
index cea456c3fce..9bc159ce88f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ObjectToSampleTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ObjectToSampleTranslator.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.asapi.v3.translator.sample;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ObjectToSamplesTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ObjectToSamplesTranslator.java
index 3c2bb9bf4d7..2ccf0895a63 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ObjectToSamplesTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/ObjectToSamplesTranslator.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.asapi.v3.translator.sample;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleAttachmentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleAttachmentTranslator.java
index 513e6bc50c5..2889b37726b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleAttachmentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleAttachmentTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleAuthorizationValidator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleAuthorizationValidator.java
index df812ae6f6a..92ad55f684d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleAuthorizationValidator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleAuthorizationValidator.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.asapi.v3.translator.sample;
 
 import java.util.*;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleBaseRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleBaseRecord.java
index 6fd387f73db..aa6087e9fcc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleBaseRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleBaseRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleBaseTranslator.java
index 180bece2d39..22c141f9882 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleChildRelationshipHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleChildRelationshipHistoryTranslator.java
index ee3946b4c56..7a3d223d67d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleChildRelationshipHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleChildRelationshipHistoryTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleChildTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleChildTranslator.java
index 38970a07608..b3245fd0bbe 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleChildTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleChildTranslator.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.asapi.v3.translator.sample;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleComponentRelationshipHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleComponentRelationshipHistoryTranslator.java
index 0d50ca86840..154279ff3ee 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleComponentRelationshipHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleComponentRelationshipHistoryTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleComponentsTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleComponentsTranslator.java
index 3c833eef158..0d35531bddf 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleComponentsTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleComponentsTranslator.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.asapi.v3.translator.sample;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleContainerRelationshipHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleContainerRelationshipHistoryTranslator.java
index 5f591fddf22..f586348e239 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleContainerRelationshipHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleContainerRelationshipHistoryTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleContainerTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleContainerTranslator.java
index 942b6d44e5a..92021404f7e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleContainerTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleContainerTranslator.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.asapi.v3.translator.sample;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleDataSetRelationshipHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleDataSetRelationshipHistoryTranslator.java
index 11c227d5ac5..3270b16f8cb 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleDataSetRelationshipHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleDataSetRelationshipHistoryTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleDataSetTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleDataSetTranslator.java
index 60f791b4ea0..dc99e0269cb 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleDataSetTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleDataSetTranslator.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.asapi.v3.translator.sample;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleExperimentRelationshipHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleExperimentRelationshipHistoryTranslator.java
index c6fdecfba34..c1f14b0d994 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleExperimentRelationshipHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleExperimentRelationshipHistoryTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleExperimentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleExperimentTranslator.java
index 528dea10b0d..f3f19cb366e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleExperimentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleExperimentTranslator.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.asapi.v3.translator.sample;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleHistoryTranslator.java
index 031fa578136..59493e70bfd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleHistoryTranslator.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.asapi.v3.translator.sample;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleMaterialPropertyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleMaterialPropertyTranslator.java
index 682508355b1..6da4a6ef6be 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleMaterialPropertyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleMaterialPropertyTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleModifierTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleModifierTranslator.java
index 4a16cf2f312..013edc17841 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleModifierTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleModifierTranslator.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.asapi.v3.translator.sample;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleParentRelationshipHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleParentRelationshipHistoryTranslator.java
index 341c746243e..54dbb939d87 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleParentRelationshipHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleParentRelationshipHistoryTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleParentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleParentTranslator.java
index fe7d88b5273..839da98fb0f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleParentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleParentTranslator.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.asapi.v3.translator.sample;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleProjectRelationshipHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleProjectRelationshipHistoryTranslator.java
index 97f03fcbd29..6d03d82c648 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleProjectRelationshipHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleProjectRelationshipHistoryTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleProjectTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleProjectTranslator.java
index 7f34d5fe713..f32b1391de2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleProjectTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleProjectTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SamplePropertyAssignmentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SamplePropertyAssignmentTranslator.java
index 38037b8066b..32165263097 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SamplePropertyAssignmentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SamplePropertyAssignmentTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SamplePropertyHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SamplePropertyHistoryTranslator.java
index e170403fbdd..e07d5d4b6d5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SamplePropertyHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SamplePropertyHistoryTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SamplePropertyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SamplePropertyTranslator.java
index 256fd143aaf..f19783d0491 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SamplePropertyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SamplePropertyTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleQuery.java
index 9a383f143cd..5d68cf293d5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.asapi.v3.translator.sample;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleRegistratorTranslator.java
index ffd708e26cf..475f779323d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleRegistratorTranslator.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.asapi.v3.translator.sample;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleRelationshipHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleRelationshipHistoryTranslator.java
index c5c5052db87..c11d38a68fc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleRelationshipHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleRelationshipHistoryTranslator.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.asapi.v3.translator.sample;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleRelationshipRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleRelationshipRecord.java
index 9aa354a60d7..e95ef84ee1c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleRelationshipRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleRelationshipRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.history.HistoryRelationshipRecord;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleSamplePropertyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleSamplePropertyTranslator.java
index fe728130a60..63ddf266a5a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleSamplePropertyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleSamplePropertyTranslator.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.asapi.v3.translator.sample;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleSpaceRelationshipHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleSpaceRelationshipHistoryTranslator.java
index 2ae3be4c111..6c64341c3e6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleSpaceRelationshipHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleSpaceRelationshipHistoryTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleSpaceTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleSpaceTranslator.java
index 20b2ab6441b..5bfb45dfd7c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleSpaceTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleSpaceTranslator.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.asapi.v3.translator.sample;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTagTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTagTranslator.java
index 75390e1c280..311a9f5416e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTagTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTagTranslator.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.asapi.v3.translator.sample;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTranslator.java
index 9fdbd1b977f..85237008b97 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTypeBaseRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTypeBaseRecord.java
index d210563151a..57727bfd407 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTypeBaseRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTypeBaseRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTypeBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTypeBaseTranslator.java
index 2f13053f23d..0d670cf4256 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTypeBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTypeBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTypeRelationTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTypeRelationTranslator.java
index b757db6e37f..2cb1457aa66 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTypeRelationTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTypeRelationTranslator.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.asapi.v3.translator.sample;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTypeSemanticAnnotationTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTypeSemanticAnnotationTranslator.java
index 871fd98f63f..fd98247abf4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTypeSemanticAnnotationTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTypeSemanticAnnotationTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTypeTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTypeTranslator.java
index ce355d89a1c..2d8d2c08af0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTypeTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTypeTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTypeValidationPluginTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTypeValidationPluginTranslator.java
index 90705db81c7..551ac531ac5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTypeValidationPluginTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleTypeValidationPluginTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleUnknownRelationshipHistoryTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleUnknownRelationshipHistoryTranslator.java
index fc66cc6106e..ec8c4a4f974 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleUnknownRelationshipHistoryTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleUnknownRelationshipHistoryTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleWithAnnotations.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleWithAnnotations.java
index 5de7178bd46..f7b4b1ac2d5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleWithAnnotations.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/SampleWithAnnotations.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.asapi.v3.translator.sample;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/search/SampleAttributeProvider.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/search/SampleAttributeProvider.java
index 0d24eac591f..3fa682ed639 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/search/SampleAttributeProvider.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/search/SampleAttributeProvider.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample.search;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleAttributeSearchFieldKind.CODE;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/search/SampleSearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/search/SampleSearchCriteriaTranslator.java
index b723a7ae648..ec5d86399a0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/search/SampleSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/sample/search/SampleSearchCriteriaTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.sample.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/ISemanticAnnotationBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/ISemanticAnnotationBaseTranslator.java
index c67c21ef9f6..42b61d29c6d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/ISemanticAnnotationBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/ISemanticAnnotationBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.semanticannotation;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectBaseTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/ISemanticAnnotationEntityTypeTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/ISemanticAnnotationEntityTypeTranslator.java
index 03005b0c819..a6492d4ae94 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/ISemanticAnnotationEntityTypeTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/ISemanticAnnotationEntityTypeTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.semanticannotation;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IEntityType;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/ISemanticAnnotationPropertyAssignmentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/ISemanticAnnotationPropertyAssignmentTranslator.java
index 22a3fc421af..d89fb310898 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/ISemanticAnnotationPropertyAssignmentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/ISemanticAnnotationPropertyAssignmentTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.semanticannotation;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.PropertyAssignment;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/ISemanticAnnotationPropertyTypeTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/ISemanticAnnotationPropertyTypeTranslator.java
index 04e99c63f8c..89aedf7c5c1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/ISemanticAnnotationPropertyTypeTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/ISemanticAnnotationPropertyTypeTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.semanticannotation;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.PropertyType;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/ISemanticAnnotationTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/ISemanticAnnotationTranslator.java
index 382f297e182..6f857bf5c02 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/ISemanticAnnotationTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/ISemanticAnnotationTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.semanticannotation;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.semanticannotation.SemanticAnnotation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/SemanticAnnotationBaseRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/SemanticAnnotationBaseRecord.java
index c4a1393172a..eb3ba12dd13 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/SemanticAnnotationBaseRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/SemanticAnnotationBaseRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.semanticannotation;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/SemanticAnnotationBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/SemanticAnnotationBaseTranslator.java
index 69197ed6708..c87561ff990 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/SemanticAnnotationBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/SemanticAnnotationBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.semanticannotation;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/SemanticAnnotationEntityTypeTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/SemanticAnnotationEntityTypeTranslator.java
index 68547c913fa..428f7f813fd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/SemanticAnnotationEntityTypeTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/SemanticAnnotationEntityTypeTranslator.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.asapi.v3.translator.semanticannotation;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/SemanticAnnotationPropertyAssignmentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/SemanticAnnotationPropertyAssignmentTranslator.java
index 4baf8be9701..a68241249c9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/SemanticAnnotationPropertyAssignmentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/SemanticAnnotationPropertyAssignmentTranslator.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.asapi.v3.translator.semanticannotation;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/SemanticAnnotationPropertyTypeTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/SemanticAnnotationPropertyTypeTranslator.java
index 31077864e1b..5ec1dca11f5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/SemanticAnnotationPropertyTypeTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/SemanticAnnotationPropertyTypeTranslator.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.asapi.v3.translator.semanticannotation;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/SemanticAnnotationQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/SemanticAnnotationQuery.java
index 4cefdd951d2..49ead429b15 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/SemanticAnnotationQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/SemanticAnnotationQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.ethz.sis.openbis.generic.server.asapi.v3.translator.semanticannotation;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/SemanticAnnotationTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/SemanticAnnotationTranslator.java
index f4ef2d4fc78..c4f25cc1a6b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/SemanticAnnotationTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/semanticannotation/SemanticAnnotationTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 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.ethz.sis.openbis.generic.server.asapi.v3.translator.semanticannotation;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/service/ISearchDomainResultTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/service/ISearchDomainResultTranslator.java
index d2f3a0c65e6..2fdd1fcf8ce 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/service/ISearchDomainResultTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/service/ISearchDomainResultTranslator.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.asapi.v3.translator.service;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/session/ISessionInformationTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/session/ISessionInformationTranslator.java
index 50f4d95a1ea..63c0b995666 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/session/ISessionInformationTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/session/ISessionInformationTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.session;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.session.SessionInformation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/session/SessionInformationTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/session/SessionInformationTranslator.java
index f3b9f38ce11..0e91971340c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/session/SessionInformationTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/session/SessionInformationTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 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.ethz.sis.openbis.generic.server.asapi.v3.translator.session;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/IObjectToSpaceTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/IObjectToSpaceTranslator.java
index b25770d527f..8ac0fd5eeaa 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/IObjectToSpaceTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/IObjectToSpaceTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.space;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.Space;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/ISpaceAuthorizationValidator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/ISpaceAuthorizationValidator.java
index 490785f81bd..68f2e0a43c3 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/ISpaceAuthorizationValidator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/ISpaceAuthorizationValidator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.space;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectAuthorizationValidator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/ISpaceBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/ISpaceBaseTranslator.java
index 63fe87a0c49..241c95f5acd 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/ISpaceBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/ISpaceBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.space;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectBaseTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/ISpaceProjectTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/ISpaceProjectTranslator.java
index 6f9784dba93..13039858430 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/ISpaceProjectTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/ISpaceProjectTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.space;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.project.IObjectToProjectsTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/ISpaceRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/ISpaceRegistratorTranslator.java
index c99993e399e..e7b290bf5ae 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/ISpaceRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/ISpaceRegistratorTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.space;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.person.IObjectToPersonTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/ISpaceSampleTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/ISpaceSampleTranslator.java
index f2e3115bc7c..306c31c3cb0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/ISpaceSampleTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/ISpaceSampleTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.space;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.sample.IObjectToSamplesTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/ISpaceTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/ISpaceTranslator.java
index cbc7febaa04..62f2dea1970 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/ISpaceTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/ISpaceTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.space;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.Space;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/ObjectToSpaceTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/ObjectToSpaceTranslator.java
index cbd37d49fdc..00632040c14 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/ObjectToSpaceTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/ObjectToSpaceTranslator.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.asapi.v3.translator.space;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceAuthorizationRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceAuthorizationRecord.java
index 5c2b987fdf3..f92c278c109 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceAuthorizationRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceAuthorizationRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.space;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceAuthorizationValidator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceAuthorizationValidator.java
index 85b45f60514..f72a79e9b78 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceAuthorizationValidator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceAuthorizationValidator.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.asapi.v3.translator.space;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceBaseRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceBaseRecord.java
index d4e2781d4ab..22ba2f94034 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceBaseRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceBaseRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.space;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceBaseTranslator.java
index c06dfb66165..762b8788975 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.space;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceProjectTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceProjectTranslator.java
index 9a6666836f1..692a8043fe2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceProjectTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceProjectTranslator.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.asapi.v3.translator.space;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceQuery.java
index 385df7850ec..0dd7ca72b89 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.asapi.v3.translator.space;
 
 import it.unimi.dsi.fastutil.longs.LongSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceRegistratorTranslator.java
index 2c1fd03b25e..0f7f5518a45 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceRegistratorTranslator.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.asapi.v3.translator.space;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceSampleTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceSampleTranslator.java
index 791180c81ac..4825acde079 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceSampleTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceSampleTranslator.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.asapi.v3.translator.space;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceTranslator.java
index 8423675aa7d..e333c5ae4aa 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/SpaceTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 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.asapi.v3.translator.space;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/search/SpaceSearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/search/SpaceSearchCriteriaTranslator.java
index 79269b628b0..d9f86af526f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/search/SpaceSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/search/SpaceSearchCriteriaTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.space.search;
 
 import java.util.EnumSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/IObjectToTagsTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/IObjectToTagsTranslator.java
index fdec5e62a66..c751366dc71 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/IObjectToTagsTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/IObjectToTagsTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.tag;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.Tag;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagAuthorizationValidator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagAuthorizationValidator.java
index 54736c26ac5..b6a18eb81e6 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagAuthorizationValidator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagAuthorizationValidator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.tag;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectAuthorizationValidator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagBaseTranslator.java
index 7b94ffd7d18..5bb3d8c2c64 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.tag;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectBaseTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagDataSetTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagDataSetTranslator.java
index feb206e1f4b..e11a288f8a9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagDataSetTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagDataSetTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.tag;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.dataset.IObjectToDataSetsTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagExperimentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagExperimentTranslator.java
index 7bd64cd559f..200e58fdf29 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagExperimentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagExperimentTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.tag;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.experiment.IObjectToExperimentsTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagMaterialTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagMaterialTranslator.java
index 809b428ee00..13cef51b0ba 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagMaterialTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagMaterialTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.tag;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.material.IObjectToMaterialsTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagOwnerTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagOwnerTranslator.java
index 49795ea8a94..860fa251df0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagOwnerTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagOwnerTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.tag;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.person.IObjectToPersonTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagSampleTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagSampleTranslator.java
index 2e702436ffc..bd05f3186ab 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagSampleTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagSampleTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.tag;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.sample.IObjectToSamplesTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagTranslator.java
index 05872c1564a..4981cb13644 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ITagTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.tag;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.Tag;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ObjectToTagsTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ObjectToTagsTranslator.java
index 0803c6d91fa..2437028b7bf 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ObjectToTagsTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/ObjectToTagsTranslator.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.asapi.v3.translator.tag;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagAuthorizationRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagAuthorizationRecord.java
index f0d62fff508..641c37a020c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagAuthorizationRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagAuthorizationRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.tag;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagAuthorizationValidator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagAuthorizationValidator.java
index 8358475580a..1710cfab4f1 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagAuthorizationValidator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagAuthorizationValidator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.tag;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagBaseRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagBaseRecord.java
index 0dffe54362a..4ff4d6a4d5b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagBaseRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagBaseRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.tag;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagBaseTranslator.java
index 828a44265b4..a1cb55a0846 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.tag;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagDataSetTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagDataSetTranslator.java
index 8eb94c5bdcf..91b38e84c1a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagDataSetTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagDataSetTranslator.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.asapi.v3.translator.tag;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagExperimentTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagExperimentTranslator.java
index 66b9455a7b0..60236624ccf 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagExperimentTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagExperimentTranslator.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.asapi.v3.translator.tag;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagMaterialTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagMaterialTranslator.java
index 591b38e0c01..deabce4d298 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagMaterialTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagMaterialTranslator.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.asapi.v3.translator.tag;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagOwnerTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagOwnerTranslator.java
index 4dd4fcbaa2b..fa4ef31b5a5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagOwnerTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagOwnerTranslator.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.asapi.v3.translator.tag;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagQuery.java
index a13796a2b41..de868ea209a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.asapi.v3.translator.tag;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagSampleTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagSampleTranslator.java
index 3381c92c90e..7e2a4ec4d4a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagSampleTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagSampleTranslator.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.asapi.v3.translator.tag;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagTranslator.java
index 2beedf19e00..292e6f4617a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/TagTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.tag;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/search/TagSearchCriteriaTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/search/TagSearchCriteriaTranslator.java
index b86ccaa4669..44cce10582b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/search/TagSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/tag/search/TagSearchCriteriaTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.tag.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyBaseTranslator.java
index 41652bf98f1..83c2507847f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.vocabulary;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectBaseTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyRegistratorTranslator.java
index c4c69fa0aa0..95a1531c88c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyRegistratorTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.vocabulary;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.person.IObjectToPersonTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyTermBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyTermBaseTranslator.java
index 4b298fd96b5..8ff5089f094 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyTermBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyTermBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.vocabulary;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.common.IObjectBaseTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyTermRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyTermRegistratorTranslator.java
index b181cc7a787..93b4a0d39e8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyTermRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyTermRegistratorTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.vocabulary;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.person.IObjectToPersonTranslator;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyTermTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyTermTranslator.java
index 87dd42da873..6af6278e107 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyTermTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyTermTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.vocabulary;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.VocabularyTerm;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyTermVocabularyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyTermVocabularyTranslator.java
index 183c5b62afd..a8502db68a4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyTermVocabularyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyTermVocabularyTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.vocabulary;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.Vocabulary;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyTranslator.java
index 61a54311eb8..39f88384a54 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.vocabulary;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.Vocabulary;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyVocabularyTermTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyVocabularyTermTranslator.java
index 4a527b064cf..af91e9a4f98 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyVocabularyTermTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/IVocabularyVocabularyTermTranslator.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.asapi.v3.translator.vocabulary;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.VocabularyTerm;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyBaseRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyBaseRecord.java
index 3a1488ef459..18c7f6aa4d5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyBaseRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyBaseRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.vocabulary;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyBaseTranslator.java
index a10c398a830..0318a319bda 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.vocabulary;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyQuery.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyQuery.java
index 7b297d728b4..eed46c04902 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyQuery.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyQuery.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.asapi.v3.translator.vocabulary;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyRegistratorTranslator.java
index b348fc751e8..37700e57c97 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyRegistratorTranslator.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.asapi.v3.translator.vocabulary;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyTermBaseRecord.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyTermBaseRecord.java
index 70753881493..f443f4b7f86 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyTermBaseRecord.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyTermBaseRecord.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.ethz.sis.openbis.generic.server.asapi.v3.translator.vocabulary;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyTermBaseTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyTermBaseTranslator.java
index 77af77ae77c..23297caa3ee 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyTermBaseTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyTermBaseTranslator.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.ethz.sis.openbis.generic.server.asapi.v3.translator.vocabulary;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyTermRegistratorTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyTermRegistratorTranslator.java
index 43141fa81c6..331476995be 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyTermRegistratorTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyTermRegistratorTranslator.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.asapi.v3.translator.vocabulary;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyTermTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyTermTranslator.java
index 791f6d41e4d..00e8bdf38c4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyTermTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyTermTranslator.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.asapi.v3.translator.vocabulary;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyTermVocabularyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyTermVocabularyTranslator.java
index 5a2b4600162..05ea9c0dd51 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyTermVocabularyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyTermVocabularyTranslator.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.asapi.v3.translator.vocabulary;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyTranslator.java
index 646ff80df78..d28b85aa44c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyTranslator.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.asapi.v3.translator.vocabulary;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyVocabularyTermTranslator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyVocabularyTermTranslator.java
index 457dd8f5c06..92f98453e50 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyVocabularyTermTranslator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/vocabulary/VocabularyVocabularyTermTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 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.ethz.sis.openbis.generic.server.asapi.v3.translator.vocabulary;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/utils/EntityUtils.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/utils/EntityUtils.java
index 0fbcf51b1ae..e9b86e2e667 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/utils/EntityUtils.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/utils/EntityUtils.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.asapi.v3.utils;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.IEntityInformationHolderDTO;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/utils/ExceptionUtils.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/utils/ExceptionUtils.java
index f041f16ad98..f38ca13a4e8 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/utils/ExceptionUtils.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/utils/ExceptionUtils.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.
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/sharedapi/v3/json/EmptyJsonClassValueToClassObjectMapping.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/sharedapi/v3/json/EmptyJsonClassValueToClassObjectMapping.java
index 9dc9688f065..4a2f4999827 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/sharedapi/v3/json/EmptyJsonClassValueToClassObjectMapping.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/sharedapi/v3/json/EmptyJsonClassValueToClassObjectMapping.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.ethz.sis.openbis.generic.server.sharedapi.v3.json;
 
 import java.util.Collections;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/sharedapi/v3/json/GenericObjectMapper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/sharedapi/v3/json/GenericObjectMapper.java
index d536f2e0e4f..9d8b038f1e4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/sharedapi/v3/json/GenericObjectMapper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/sharedapi/v3/json/GenericObjectMapper.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.ethz.sis.openbis.generic.server.sharedapi.v3.json;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/sharedapi/v3/json/JsonBaseTypeToSubTypesMapping.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/sharedapi/v3/json/JsonBaseTypeToSubTypesMapping.java
index 0a0decdf38d..a77bcadba4c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/sharedapi/v3/json/JsonBaseTypeToSubTypesMapping.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/sharedapi/v3/json/JsonBaseTypeToSubTypesMapping.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.ethz.sis.openbis.generic.server.sharedapi.v3.json;
 
 import ch.systemsx.cisd.openbis.common.api.server.json.mapping.JsonReflectionsBaseTypeToSubTypesMapping;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/sharedapi/v3/json/ObjectMapperResource.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/sharedapi/v3/json/ObjectMapperResource.java
index 911d0adbe88..ba743274b13 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/sharedapi/v3/json/ObjectMapperResource.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/sharedapi/v3/json/ObjectMapperResource.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.ethz.sis.openbis.generic.server.sharedapi.v3.json;
 
 /**
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/ExportHelperFactory.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/ExportHelperFactory.java
index 5c38db58f55..9144d392b9e 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/ExportHelperFactory.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/ExportHelperFactory.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.xls.export;
 
 import org.apache.poi.ss.usermodel.Workbook;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/ExportableKind.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/ExportableKind.java
index cad29b0e767..2cc3a98cc28 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/ExportableKind.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/ExportableKind.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.xls.export;
 
 import java.util.EnumSet;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/ExportablePermId.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/ExportablePermId.java
index 9411313dec7..2fd0a4d9038 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/ExportablePermId.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/ExportablePermId.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.xls.export;
 
 import static ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.EntityKind.DATA_SET;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/XLSExport.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/XLSExport.java
index dd3bc4f80a3..9808c9f4ca0 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/XLSExport.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/XLSExport.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.xls.export;
 
 import static ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.EntityKind.DATA_SET;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/AbstractXLSExportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/AbstractXLSExportHelper.java
index 14450b420dc..33111f2afbc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/AbstractXLSExportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/AbstractXLSExportHelper.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.xls.export.helper;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/IXLSExportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/IXLSExportHelper.java
index a48ac647a3f..1d5065c9223 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/IXLSExportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/IXLSExportHelper.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.xls.export.helper;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSDataSetExportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSDataSetExportHelper.java
index 60d1d3d5c6e..637e436fade 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSDataSetExportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSDataSetExportHelper.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.xls.export.helper;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSDataSetTypeExportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSDataSetTypeExportHelper.java
index eae8f222e59..8a2474e2e67 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSDataSetTypeExportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSDataSetTypeExportHelper.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.xls.export.helper;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSExperimentExportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSExperimentExportHelper.java
index 5a4ffc33490..ab2a8a0453a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSExperimentExportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSExperimentExportHelper.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.xls.export.helper;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSExperimentTypeExportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSExperimentTypeExportHelper.java
index f10df07247c..c33d319ecb2 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSExperimentTypeExportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSExperimentTypeExportHelper.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.xls.export.helper;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSProjectExportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSProjectExportHelper.java
index 0307339c010..1192b282f74 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSProjectExportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSProjectExportHelper.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.xls.export.helper;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSSampleExportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSSampleExportHelper.java
index bb2edd3ed43..6234774ea78 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSSampleExportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSSampleExportHelper.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.xls.export.helper;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSSampleTypeExportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSSampleTypeExportHelper.java
index 27a468195c1..fecde50ec14 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSSampleTypeExportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSSampleTypeExportHelper.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.xls.export.helper;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSSpaceExportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSSpaceExportHelper.java
index 05c20f93a98..cde5ef56477 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSSpaceExportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSSpaceExportHelper.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.xls.export.helper;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSVocabularyExportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSVocabularyExportHelper.java
index 123a11c9a34..6d6746209fb 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSVocabularyExportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSVocabularyExportHelper.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.xls.export.helper;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/ImportOptions.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/ImportOptions.java
index 742802228be..8073db2fb82 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/ImportOptions.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/ImportOptions.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.xls.importer;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/MainImportXlsTest.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/MainImportXlsTest.java
index 4abeccdb759..d34f6a28131 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/MainImportXlsTest.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/MainImportXlsTest.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.xls.importer;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/XLSImport.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/XLSImport.java
index 92a8ce3ea99..26e5c24761c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/XLSImport.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/XLSImport.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.xls.importer;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.IApplicationServerApi;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/delay/DelayedExecution.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/delay/DelayedExecution.java
index 567b968cfbd..53ad6a53d97 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/delay/DelayedExecution.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/delay/DelayedExecution.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.xls.importer.delay;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/delay/DelayedExecutionDecorator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/delay/DelayedExecutionDecorator.java
index 65ce54393f8..0e0da736e62 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/delay/DelayedExecutionDecorator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/delay/DelayedExecutionDecorator.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.xls.importer.delay;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.IApplicationServerApi;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/delay/IdentifierVariable.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/delay/IdentifierVariable.java
index 1528caf18d0..3463f2f25b9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/delay/IdentifierVariable.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/delay/IdentifierVariable.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.xls.importer.delay;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.id.ISampleId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/enums/ImportModes.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/enums/ImportModes.java
index 147d32d7276..984187f4113 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/enums/ImportModes.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/enums/ImportModes.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.xls.importer.enums;
 
 public enum ImportModes
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/enums/ImportTypes.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/enums/ImportTypes.java
index 91867c050e8..2a14aa2a74d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/enums/ImportTypes.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/enums/ImportTypes.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.xls.importer.enums;
 
 public enum ImportTypes
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/enums/ScriptTypes.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/enums/ScriptTypes.java
index 9907c1e50b9..251e1687b13 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/enums/ScriptTypes.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/enums/ScriptTypes.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.xls.importer.enums;
 
 public enum ScriptTypes
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/handler/ExcelParser.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/handler/ExcelParser.java
index ac397013d92..fe0bd07bbeb 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/handler/ExcelParser.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/handler/ExcelParser.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.xls.importer.handler;
 
 import ch.systemsx.cisd.common.logging.LogCategory;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/handler/JSONHandler.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/handler/JSONHandler.java
index dfda7e95ea1..53066adfec7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/handler/JSONHandler.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/handler/JSONHandler.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.xls.importer.handler;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/handler/VersionInfoHandler.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/handler/VersionInfoHandler.java
index dd9781f2ad2..680eaf7fcc7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/handler/VersionInfoHandler.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/handler/VersionInfoHandler.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.xls.importer.handler;
 
 import ch.ethz.sis.openbis.generic.server.xls.importer.ImportOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/AbstractImportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/AbstractImportHelper.java
index eb06bd5c96e..6834a6d9b6a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/AbstractImportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/AbstractImportHelper.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.xls.importer.helper;
 
 import ch.ethz.sis.openbis.generic.server.xls.importer.utils.IAttribute;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/BasicImportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/BasicImportHelper.java
index 431fd775d88..13fac48ce30 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/BasicImportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/BasicImportHelper.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.xls.importer.helper;
 
 import ch.ethz.sis.openbis.generic.server.xls.importer.ImportOptions;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/DatasetTypeImportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/DatasetTypeImportHelper.java
index 8d606732b92..2ad599f8354 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/DatasetTypeImportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/DatasetTypeImportHelper.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.xls.importer.helper;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.create.DataSetTypeCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/ExperimentImportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/ExperimentImportHelper.java
index 67cf1014d09..a9d67544190 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/ExperimentImportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/ExperimentImportHelper.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.xls.importer.helper;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.id.EntityTypePermId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/ExperimentTypeImportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/ExperimentTypeImportHelper.java
index e8c94eb3586..b13bee4e695 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/ExperimentTypeImportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/ExperimentTypeImportHelper.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.xls.importer.helper;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.id.EntityTypePermId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/ProjectImportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/ProjectImportHelper.java
index 66bbe0c6f57..e86300d275a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/ProjectImportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/ProjectImportHelper.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.xls.importer.helper;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.project.create.ProjectCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/PropertyAssignmentImportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/PropertyAssignmentImportHelper.java
index ca570fbe2b5..d0a699346d7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/PropertyAssignmentImportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/PropertyAssignmentImportHelper.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.xls.importer.helper;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces.IEntityType;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/PropertyTypeImportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/PropertyTypeImportHelper.java
index e3ecdd1d73b..5eae9b65c2b 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/PropertyTypeImportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/PropertyTypeImportHelper.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.xls.importer.helper;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.EntityKind;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/SampleImportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/SampleImportHelper.java
index d049485f2bc..36a17a5ecb5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/SampleImportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/SampleImportHelper.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.xls.importer.helper;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.id.EntityTypePermId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/SampleTypeImportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/SampleTypeImportHelper.java
index f357348561b..19f82d0f67d 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/SampleTypeImportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/SampleTypeImportHelper.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.xls.importer.helper;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.id.EntityTypePermId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/ScriptImportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/ScriptImportHelper.java
index 84f85ef52e9..a9c20d5611a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/ScriptImportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/ScriptImportHelper.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.xls.importer.helper;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.plugin.PluginType;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/SemanticAnnotationImportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/SemanticAnnotationImportHelper.java
index 84f2677b60f..142ef2cdeb5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/SemanticAnnotationImportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/SemanticAnnotationImportHelper.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.xls.importer.helper;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.EntityKind;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/SpaceImportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/SpaceImportHelper.java
index 74aec9edb7f..23bc56078d4 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/SpaceImportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/SpaceImportHelper.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.xls.importer.helper;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.create.SpaceCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/VocabularyImportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/VocabularyImportHelper.java
index 67294e89488..b9b8664c969 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/VocabularyImportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/VocabularyImportHelper.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.xls.importer.helper;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.create.VocabularyCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/VocabularyTermImportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/VocabularyTermImportHelper.java
index cac071cabbd..a7548cc204f 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/VocabularyTermImportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/helper/VocabularyTermImportHelper.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.xls.importer.helper;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.create.VocabularyTermCreation;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/semantic/ApplicationServerSemanticAPIExtensions.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/semantic/ApplicationServerSemanticAPIExtensions.java
index 23b58a9b2aa..969245587bc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/semantic/ApplicationServerSemanticAPIExtensions.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/semantic/ApplicationServerSemanticAPIExtensions.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.xls.importer.semantic;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.EntityKind;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/utils/AttributeValidator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/utils/AttributeValidator.java
index 6acfe1f7edc..5c388b29d7c 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/utils/AttributeValidator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/utils/AttributeValidator.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.xls.importer.utils;
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
 
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/utils/DatabaseConsistencyChecker.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/utils/DatabaseConsistencyChecker.java
index 210bb9ca4be..9bd91a587a9 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/utils/DatabaseConsistencyChecker.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/utils/DatabaseConsistencyChecker.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.xls.importer.utils;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.IApplicationServerApi;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/utils/IAttribute.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/utils/IAttribute.java
index 67d770b664c..2c19baed7bc 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/utils/IAttribute.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/utils/IAttribute.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.xls.importer.utils;
 
 public interface IAttribute {
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/utils/ImportUtils.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/utils/ImportUtils.java
index e79cb7d5b75..1c413c5aeb7 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/utils/ImportUtils.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/utils/ImportUtils.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.xls.importer.utils;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.project.id.IProjectId;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/utils/PropertyTypeSearcher.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/utils/PropertyTypeSearcher.java
index f3e3687cd50..634449cb87a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/utils/PropertyTypeSearcher.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/utils/PropertyTypeSearcher.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.xls.importer.utils;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.LongDateFormat;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/utils/VersionUtils.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/utils/VersionUtils.java
index 5e5fb02e65b..43f11690d59 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/utils/VersionUtils.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/importer/utils/VersionUtils.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.xls.importer.utils;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/shared/utils/AutoSymlink.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/shared/utils/AutoSymlink.java
index 5b61f072b07..6985e7b2474 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/shared/utils/AutoSymlink.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/shared/utils/AutoSymlink.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 ETH Zuerich, SIS
+ * 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.ethz.sis.openbis.generic.shared.utils;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/BuildAndEnvironmentInfo.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/BuildAndEnvironmentInfo.java
index 3463c9abb49..c662e3181d8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/BuildAndEnvironmentInfo.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/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;
 
 import ch.systemsx.cisd.base.utilities.AbstractBuildAndEnvironmentInfo;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/AbstractWebStartClientServingServlet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/AbstractWebStartClientServingServlet.java
index 0a163a521a9..979eaf2b9fc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/AbstractWebStartClientServingServlet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/AbstractWebStartClientServingServlet.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.generic.client.api.gui;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java
index ddd8725684b..16dbfcd2b48 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.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.generic.client.api.gui;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/cli/DataSetLister.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/cli/DataSetLister.java
index a559e757509..67f66a750c2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/cli/DataSetLister.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/cli/DataSetLister.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.generic.client.cli;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/cli/Login.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/cli/Login.java
index 786607d7bdd..d17d34085e8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/cli/Login.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/cli/Login.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.generic.client.cli;
 
 import java.io.BufferedReader;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/AbstractRegisterEntityType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/AbstractRegisterEntityType.java
index 40757f68a76..4144e527e01 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/AbstractRegisterEntityType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/AbstractRegisterEntityType.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.generic.client.console;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/AdminConsole.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/AdminConsole.java
index 7e86f030559..066a01425fe 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/AdminConsole.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/AdminConsole.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.generic.client.console;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/Assignment.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/Assignment.java
index cfc2065b7ef..9d4cf2b062b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/Assignment.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/Assignment.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.generic.client.console;
 
 import ch.systemsx.cisd.openbis.generic.shared.ICommonServer;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/AttributeSetter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/AttributeSetter.java
index 382268a7b7d..f8ada7ef7cf 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/AttributeSetter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/AttributeSetter.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.generic.client.console;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/ICommand.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/ICommand.java
index c3cf588c055..c35023847e5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/ICommand.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/ICommand.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.generic.client.console;
 
 import ch.systemsx.cisd.openbis.generic.shared.ICommonServer;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/Lexer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/Lexer.java
index ce22063c87d..064dd76f4ed 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/Lexer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/Lexer.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.generic.client.console;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/RegisterDataSetType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/RegisterDataSetType.java
index d76edf79c3d..37c17481ff7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/RegisterDataSetType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/RegisterDataSetType.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.generic.client.console;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/RegisterExperimentType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/RegisterExperimentType.java
index 72d9c6bb7ea..ba892679bd1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/RegisterExperimentType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/RegisterExperimentType.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.generic.client.console;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/RegisterMaterialType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/RegisterMaterialType.java
index 27ce1f057b5..32e19ea0c82 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/RegisterMaterialType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/RegisterMaterialType.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.generic.client.console;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/RegisterPropertyType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/RegisterPropertyType.java
index 946953cdd66..88638c5a916 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/RegisterPropertyType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/RegisterPropertyType.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.generic.client.console;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/RegisterSampleType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/RegisterSampleType.java
index 6dd5d231aff..b7392b806dd 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/RegisterSampleType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/RegisterSampleType.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.generic.client.console;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/RegisterType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/RegisterType.java
index 8a7b0f57ac7..7dfa72bc711 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/RegisterType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/RegisterType.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.generic.client.console;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/ScriptContext.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/ScriptContext.java
index 3e2d84df62a..5c9c78e36bf 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/ScriptContext.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/ScriptContext.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.generic.client.console;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/Set.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/Set.java
index c58b8397953..01a285b2529 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/Set.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/console/Set.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.generic.client.console;
 
 import ch.systemsx.cisd.openbis.generic.shared.ICommonServer;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IClientService.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IClientService.java
index 7c6ce795a3a..3ef9c58c54c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IClientService.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IClientService.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.generic.client.web.client;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IClientServiceAsync.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IClientServiceAsync.java
index 8e3c9b2c5fc..40125cae257 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IClientServiceAsync.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IClientServiceAsync.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.generic.client.web.client;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientService.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientService.java
index 143d07c4f87..57c2341a7e5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientService.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientService.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.generic.client.web.client;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientServiceAsync.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientServiceAsync.java
index b8ca9958bbd..2a9c5343640 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientServiceAsync.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientServiceAsync.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.generic.client.web.client;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IOnlineHelpResourceLocatorService.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IOnlineHelpResourceLocatorService.java
index 826ba3b2bb9..83ab5c8775d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IOnlineHelpResourceLocatorService.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IOnlineHelpResourceLocatorService.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.generic.client.web.client;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AbstractAsyncCallback.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AbstractAsyncCallback.java
index 5fda8cbbfce..21db611361c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AbstractAsyncCallback.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AbstractAsyncCallback.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.generic.client.web.client.application;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AbstractClientPluginFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AbstractClientPluginFactory.java
index 9f5205a94df..7141f1268d3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AbstractClientPluginFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AbstractClientPluginFactory.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.generic.client.web.client.application;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.IClientServiceAsync;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AbstractPluginViewContext.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AbstractPluginViewContext.java
index fb3f037b0ba..f28fd05f14e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AbstractPluginViewContext.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AbstractPluginViewContext.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.generic.client.web.client.application;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ActionContext.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ActionContext.java
index d574737e543..64053d6c9f3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ActionContext.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ActionContext.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.generic.client.web.client.application;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Experiment;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AsyncCallbackWithProgressBar.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AsyncCallbackWithProgressBar.java
index fbbad4585a5..2150c1ccbbe 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AsyncCallbackWithProgressBar.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AsyncCallbackWithProgressBar.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.generic.client.web.client.application;
 
 import com.extjs.gxt.ui.client.widget.Dialog;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AttachmentVersionsSection.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AttachmentVersionsSection.java
index 243cc51c27d..ae0451b003c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AttachmentVersionsSection.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AttachmentVersionsSection.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.generic.client.web.client.application;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/CallbackListenerAdapter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/CallbackListenerAdapter.java
index e27e9e259af..064503e7557 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/CallbackListenerAdapter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/CallbackListenerAdapter.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.generic.client.web.client.application;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Client.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Client.java
index 11d5419cea1..ca5fb020cd9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Client.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Client.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.generic.client.web.client.application;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/CommonViewContext.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/CommonViewContext.java
index 7514d6474ba..155bb954665 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/CommonViewContext.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/CommonViewContext.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.generic.client.web.client.application;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java
index 7cda66efa11..da8cbe49e30 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.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.generic.client.web.client.application;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/DisposableTabContent.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/DisposableTabContent.java
index 97f5fab30e0..ba5675d09c9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/DisposableTabContent.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/DisposableTabContent.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.generic.client.web.client.application;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.IDatabaseModificationObserver;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/FormPanelListener.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/FormPanelListener.java
index 0286b2fbe18..6012c973cc9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/FormPanelListener.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/FormPanelListener.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.generic.client.web.client.application;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/GenericViewModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/GenericViewModel.java
index 6463ad8f238..86550b40a65 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/GenericViewModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/GenericViewModel.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.generic.client.web.client.application;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ApplicationInfo;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/GlobalSearchTabItemFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/GlobalSearchTabItemFactory.java
index 993e3363dd1..d79b5292671 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/GlobalSearchTabItemFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/GlobalSearchTabItemFactory.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.generic.client.web.client.application;
 
 import com.extjs.gxt.ui.client.mvc.Dispatcher;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ICallbackListener.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ICallbackListener.java
index bbd7eeb07be..33bba7dfa1e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ICallbackListener.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ICallbackListener.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.generic.client.web.client.application;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/IGenericImageBundle.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/IGenericImageBundle.java
index 0b708951930..4bbce3c80a2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/IGenericImageBundle.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/IGenericImageBundle.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.generic.client.web.client.application;
 
 import com.google.gwt.resources.client.ClientBundle;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/IOnSuccessAction.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/IOnSuccessAction.java
index 6affc2b89ea..d0bb59749c4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/IOnSuccessAction.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/IOnSuccessAction.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.generic.client.web.client.application;
 
 public interface IOnSuccessAction<T>
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/IPageController.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/IPageController.java
index 79d2048bfd5..c23cef73631 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/IPageController.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/IPageController.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.generic.client.web.client.application;
 
 import com.extjs.gxt.ui.client.mvc.Dispatcher;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/IViewContext.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/IViewContext.java
index aa63ae0ae17..8e290d2b424 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/IViewContext.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/IViewContext.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.generic.client.web.client.application;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.IClientServiceAsync;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/InfoBoxCallbackListener.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/InfoBoxCallbackListener.java
index c2faf6e176e..17e3cedd678 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/InfoBoxCallbackListener.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/InfoBoxCallbackListener.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.generic.client.web.client.application;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.IInfoHandler;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ManagedPropertySection.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ManagedPropertySection.java
index 98a3cd54cfe..5d53abd8122 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ManagedPropertySection.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ManagedPropertySection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.generic.client.web.client.application;
 
 import java.util.Set;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/MatchingEntitiesPanel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/MatchingEntitiesPanel.java
index b0825422e85..a9506226adc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/MatchingEntitiesPanel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/MatchingEntitiesPanel.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.generic.client.web.client.application;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.MatchingEntitiesPanelColumnIDs.ENTITY_TYPE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ProjectPropertiesPanel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ProjectPropertiesPanel.java
index a4e2bd259cd..fc5fc79b846 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ProjectPropertiesPanel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ProjectPropertiesPanel.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.generic.client.web.client.application;
 
 /*
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ProjectViewer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ProjectViewer.java
index 1de57d624db..5dd337cba19 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ProjectViewer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ProjectViewer.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.generic.client.web.client.application;
 
 import java.util.Set;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SearchWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SearchWidget.java
index 2d96bfdad2b..731715f57c8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SearchWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SearchWidget.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.generic.client.web.client.application;
 
 import com.extjs.gxt.ui.client.event.BaseEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SearchableEntitySelectionWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SearchableEntitySelectionWidget.java
index d077de21fb5..974791f0a8d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SearchableEntitySelectionWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SearchableEntitySelectionWidget.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.generic.client.web.client.application;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ShowRelatedDatasetsDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ShowRelatedDatasetsDialog.java
index ba483bc4e81..88bfbea7c31 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ShowRelatedDatasetsDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ShowRelatedDatasetsDialog.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.generic.client.web.client.application;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ShowResultSetCutInfo.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ShowResultSetCutInfo.java
index d57e4a09f77..573ef9abd6f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ShowResultSetCutInfo.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ShowResultSetCutInfo.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.generic.client.web.client.application;
 
 import com.extjs.gxt.ui.client.widget.MessageBox;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/TabContent.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/TabContent.java
index 8a3cbd2fa05..68796d5bf08 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/TabContent.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/TabContent.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.generic.client.web.client.application;
 
 import com.extjs.gxt.ui.client.widget.ContentPanel;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/UrlParamsHelper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/UrlParamsHelper.java
index e554cd16114..ba46f248a7c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/UrlParamsHelper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/UrlParamsHelper.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.generic.client.web.client.application;
 
 import com.google.gwt.user.client.History;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/VoidAsyncCallback.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/VoidAsyncCallback.java
index 1d16671c154..fd7fa085983 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/VoidAsyncCallback.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/VoidAsyncCallback.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.generic.client.web.client.application;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/AbstractDatabaseModificationObserverWithCallback.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/AbstractDatabaseModificationObserverWithCallback.java
index 1b1cf11df9d..42da9a356dd 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/AbstractDatabaseModificationObserverWithCallback.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/AbstractDatabaseModificationObserverWithCallback.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.generic.client.web.client.application.framework;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelegatedAction;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/AbstractTabItemFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/AbstractTabItemFactory.java
index ac1ad726032..1f6c048f61b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/AbstractTabItemFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/AbstractTabItemFactory.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.generic.client.web.client.application.framework;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.help.HelpPageIdentifier;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/AppController.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/AppController.java
index 7791afe1ef2..51d7a4be19d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/AppController.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/AppController.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.generic.client.web.client.application.framework;
 
 import com.extjs.gxt.ui.client.mvc.AppEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/AppEvents.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/AppEvents.java
index 1aa1f6682b9..1c1fcfc3bdf 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/AppEvents.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/AppEvents.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.generic.client.web.client.application.framework;
 
 import com.extjs.gxt.ui.client.event.EventType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/AppView.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/AppView.java
index 19fc1b420d2..bfaf12c923b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/AppView.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/AppView.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.generic.client.web.client.application.framework;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/ComponentProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/ComponentProvider.java
index c1d31cddaa5..cad25e435ef 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/ComponentProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/ComponentProvider.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.generic.client.web.client.application.framework;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/ComponentWithCloseConfirmationUtil.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/ComponentWithCloseConfirmationUtil.java
index 7c27e1765fc..9175e0207d7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/ComponentWithCloseConfirmationUtil.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/ComponentWithCloseConfirmationUtil.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.generic.client.web.client.application.framework;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/CompositeDatabaseModificationObserver.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/CompositeDatabaseModificationObserver.java
index d741342fb6b..b11de7b0a04 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/CompositeDatabaseModificationObserver.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/CompositeDatabaseModificationObserver.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.generic.client.web.client.application.framework;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/CompositeDatabaseModificationObserverWithMainObserver.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/CompositeDatabaseModificationObserverWithMainObserver.java
index 0e7bdd3cd68..cdc47ef752d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/CompositeDatabaseModificationObserverWithMainObserver.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/CompositeDatabaseModificationObserverWithMainObserver.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.generic.client.web.client.application.framework;
 
 import java.util.HashSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DatabaseModificationAwareComponent.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DatabaseModificationAwareComponent.java
index 0f1177c0a15..c77e365758c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DatabaseModificationAwareComponent.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DatabaseModificationAwareComponent.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.generic.client.web.client.application.framework;
 
 import com.extjs.gxt.ui.client.widget.Component;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DatabaseModificationAwareField.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DatabaseModificationAwareField.java
index 0a50bf8e7d5..7f7e46183d0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DatabaseModificationAwareField.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DatabaseModificationAwareField.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.generic.client.web.client.application.framework;
 
 import com.extjs.gxt.ui.client.widget.form.Field;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DatabaseModificationAwareObject.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DatabaseModificationAwareObject.java
index 6fb12a0e946..cbcff561eef 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DatabaseModificationAwareObject.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DatabaseModificationAwareObject.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.generic.client.web.client.application.framework;
 
 import java.util.Set;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DatabaseModificationAwareWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DatabaseModificationAwareWidget.java
index 903ac116dfc..425bfdddbb7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DatabaseModificationAwareWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DatabaseModificationAwareWidget.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.generic.client.web.client.application.framework;
 
 import com.google.gwt.user.client.ui.Widget;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DebugPanelManager.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DebugPanelManager.java
index 4ce61926679..12f67d6f249 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DebugPanelManager.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DebugPanelManager.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.generic.client.web.client.application.framework;
 
 import com.google.gwt.debugpanel.client.DefaultCookieDebugPanelComponent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DefaultTabItem.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DefaultTabItem.java
index 9aadad46414..840942aed87 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DefaultTabItem.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DefaultTabItem.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.generic.client.web.client.application.framework;
 
 import com.extjs.gxt.ui.client.widget.Component;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DispatcherHelper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DispatcherHelper.java
index bbebce9d0bf..435db3323da 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DispatcherHelper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DispatcherHelper.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.generic.client.web.client.application.framework;
 
 import com.extjs.gxt.ui.client.event.EventType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DisplaySettingsManager.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DisplaySettingsManager.java
index ae9517f85cc..afb148138f1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DisplaySettingsManager.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DisplaySettingsManager.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.generic.client.web.client.application.framework;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DisplayTypeIDGenerator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DisplayTypeIDGenerator.java
index f12b047b1f9..b5c837d545c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DisplayTypeIDGenerator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DisplayTypeIDGenerator.java
@@ -1,6 +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.
@@ -14,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.generic.client.web.client.application.framework;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DummyComponent.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DummyComponent.java
index b6172cb885c..fa96c39123f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DummyComponent.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DummyComponent.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.generic.client.web.client.application.framework;
 
 import com.extjs.gxt.ui.client.widget.LayoutContainer;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/HtmlPage.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/HtmlPage.java
index 26c8dbf1cb0..3b7425a4608 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/HtmlPage.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/HtmlPage.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.generic.client.web.client.application.framework;
 
 import com.google.gwt.http.client.Request;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IClosableItem.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IClosableItem.java
index 4518d521255..81269f8997d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IClosableItem.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IClosableItem.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.generic.client.web.client.application.framework;
 
 import com.extjs.gxt.ui.client.widget.Component;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IComponentWithCloseConfirmation.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IComponentWithCloseConfirmation.java
index 30d65f14d6b..53e3b8dd0af 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IComponentWithCloseConfirmation.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IComponentWithCloseConfirmation.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.generic.client.web.client.application.framework;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IComponentWithRefresh.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IComponentWithRefresh.java
index 627b54c4638..79fe3ef3c51 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IComponentWithRefresh.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IComponentWithRefresh.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.generic.client.web.client.application.framework;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IDatabaseModificationObserver.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IDatabaseModificationObserver.java
index cb44a13bab4..fc2f9f09502 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IDatabaseModificationObserver.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IDatabaseModificationObserver.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.generic.client.web.client.application.framework;
 
 import java.util.Set;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IDatabaseModificationObserverWithCallback.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IDatabaseModificationObserverWithCallback.java
index caa03805a4b..d7f1fbce3a4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IDatabaseModificationObserverWithCallback.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IDatabaseModificationObserverWithCallback.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.generic.client.web.client.application.framework;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDelegatedAction;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IDisplaySettingsGetter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IDisplaySettingsGetter.java
index c76f8fcda82..eb18879307a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IDisplaySettingsGetter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IDisplaySettingsGetter.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.generic.client.web.client.application.framework;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IDisplayTypeIDGenerator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IDisplayTypeIDGenerator.java
index 604e0116ca5..22d24f1d296 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IDisplayTypeIDGenerator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IDisplayTypeIDGenerator.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.generic.client.web.client.application.framework;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IMainPanel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IMainPanel.java
index f5817ff2368..60a8168fa01 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IMainPanel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IMainPanel.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.generic.client.web.client.application.framework;
 
 import com.google.gwt.user.client.ui.Widget;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/ITabItem.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/ITabItem.java
index 72ef2c88d93..fa27653e397 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/ITabItem.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/ITabItem.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.generic.client.web.client.application.framework;
 
 import com.extjs.gxt.ui.client.widget.TabItem;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/LastHistoryTokenUpdater.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/LastHistoryTokenUpdater.java
index ff435302746..97528552b1a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/LastHistoryTokenUpdater.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/LastHistoryTokenUpdater.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.generic.client.web.client.application.framework;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/LastModificationStateUpdater.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/LastModificationStateUpdater.java
index 75fba85854e..4488aba6d1b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/LastModificationStateUpdater.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/LastModificationStateUpdater.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.generic.client.web.client.application.framework;
 
 import java.util.HashSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/LoginController.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/LoginController.java
index bb3e88fbe60..0b4044409c8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/LoginController.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/LoginController.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.generic.client.web.client.application.framework;
 
 import com.extjs.gxt.ui.client.mvc.AppEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/LoginPage.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/LoginPage.java
index c6a6b272c2a..1ffff9e3c02 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/LoginPage.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/LoginPage.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.generic.client.web.client.application.framework;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/LoginView.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/LoginView.java
index 8f1adf98eb3..293f9cdf283 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/LoginView.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/LoginView.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.generic.client.web.client.application.framework;
 
 import com.extjs.gxt.ui.client.mvc.AppEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/MainPagePanel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/MainPagePanel.java
index b397a47fff3..cf33a1a24e6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/MainPagePanel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/MainPagePanel.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.generic.client.web.client.application.framework;
 
 import com.extjs.gxt.ui.client.widget.Component;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/MainTabPanel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/MainTabPanel.java
index d69f4e255cc..4f73471e400 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/MainTabPanel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/MainTabPanel.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.generic.client.web.client.application.framework;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/SampleTypeDisplayID.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/SampleTypeDisplayID.java
index ec8af1d819c..5bf425c21b3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/SampleTypeDisplayID.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/SampleTypeDisplayID.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.generic.client.web.client.application.framework;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/TabTitleUpdater.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/TabTitleUpdater.java
index de84cc7aade..39411ecf577 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/TabTitleUpdater.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/TabTitleUpdater.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.client.web.client.application.framework;
 
 import com.extjs.gxt.ui.client.widget.TabItem;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/WelcomePanelHelper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/WelcomePanelHelper.java
index ca0859880b2..1debb7418f7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/WelcomePanelHelper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/WelcomePanelHelper.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.generic.client.web.client.application.framework;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.StandardPortletNames.HISTORY;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/help/HelpPageIdentifier.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/help/HelpPageIdentifier.java
index db544f6519d..72b3259bc46 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/help/HelpPageIdentifier.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/help/HelpPageIdentifier.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.generic.client.web.client.application.help;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/AbstractViewLocatorResolver.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/AbstractViewLocatorResolver.java
index d4a97c001f5..1eddd898c7a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/AbstractViewLocatorResolver.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/AbstractViewLocatorResolver.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.generic.client.web.client.application.locator;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/AttachmentDownloadLocatorResolver.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/AttachmentDownloadLocatorResolver.java
index 371242c189e..57752cc3130 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/AttachmentDownloadLocatorResolver.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/AttachmentDownloadLocatorResolver.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.generic.client.web.client.application.locator;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/BrowserLocatorResolver.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/BrowserLocatorResolver.java
index 7bc56bf08eb..18d65589200 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/BrowserLocatorResolver.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/BrowserLocatorResolver.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.generic.client.web.client.application.locator;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/CustomImportLocatorResolver.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/CustomImportLocatorResolver.java
index 1d80f0aebae..29d171160a0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/CustomImportLocatorResolver.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/CustomImportLocatorResolver.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.openbis.generic.client.web.client.application.locator;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/DataSetSearchLocatorResolver.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/DataSetSearchLocatorResolver.java
index fba084f5195..06aa40a45bf 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/DataSetSearchLocatorResolver.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/DataSetSearchLocatorResolver.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.generic.client.web.client.application.locator;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/GlobalSearchLocatorResolver.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/GlobalSearchLocatorResolver.java
index 33a98340f97..caaddc5f187 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/GlobalSearchLocatorResolver.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/GlobalSearchLocatorResolver.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.generic.client.web.client.application.locator;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/HomeLocatorResolver.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/HomeLocatorResolver.java
index a9272bc580a..434bae30287 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/HomeLocatorResolver.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/HomeLocatorResolver.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.generic.client.web.client.application.locator;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/IViewLocatorResolver.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/IViewLocatorResolver.java
index 48afcc95ec3..523f23759d1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/IViewLocatorResolver.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/IViewLocatorResolver.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.generic.client.web.client.application.locator;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/MaterialCodeUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/MaterialCodeUtils.java
index eeba7418b16..fd8d7f693d4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/MaterialCodeUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/MaterialCodeUtils.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.generic.client.web.client.application.locator;
 
 import java.io.UnsupportedEncodingException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/MaterialLocatorResolver.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/MaterialLocatorResolver.java
index e970fb30761..f33369262cf 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/MaterialLocatorResolver.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/MaterialLocatorResolver.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.generic.client.web.client.application.locator;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/MetaprojectBrowserLocatorResolver.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/MetaprojectBrowserLocatorResolver.java
index c3ed1a2bc86..86044c8634f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/MetaprojectBrowserLocatorResolver.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/MetaprojectBrowserLocatorResolver.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.openbis.generic.client.web.client.application.locator;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/MetaprojectLocatorResolver.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/MetaprojectLocatorResolver.java
index 8ab05158eb1..2613b9c2974 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/MetaprojectLocatorResolver.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/MetaprojectLocatorResolver.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.openbis.generic.client.web.client.application.locator;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/OpenViewAction.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/OpenViewAction.java
index 89419ab7d1e..62a553e70f7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/OpenViewAction.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/OpenViewAction.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.generic.client.web.client.application.locator;
 
 import com.extjs.gxt.ui.client.widget.MessageBox;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/PermlinkEditingLocatorResolver.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/PermlinkEditingLocatorResolver.java
index 5048d1ef1a9..b4b66563a2f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/PermlinkEditingLocatorResolver.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/PermlinkEditingLocatorResolver.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.generic.client.web.client.application.locator;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/PermlinkLocatorResolver.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/PermlinkLocatorResolver.java
index 22271049cc3..cd9294024b1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/PermlinkLocatorResolver.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/PermlinkLocatorResolver.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.generic.client.web.client.application.locator;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/ProjectLocatorResolver.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/ProjectLocatorResolver.java
index d4a03b85300..b43ac0f19f4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/ProjectLocatorResolver.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/ProjectLocatorResolver.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.generic.client.web.client.application.locator;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/SampleRegistrationLocatorResolver.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/SampleRegistrationLocatorResolver.java
index a56b8e97eca..83c940499ac 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/SampleRegistrationLocatorResolver.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/SampleRegistrationLocatorResolver.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.generic.client.web.client.application.locator;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/SampleSearchLocatorResolver.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/SampleSearchLocatorResolver.java
index 86956c270b3..057c99ea3df 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/SampleSearchLocatorResolver.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/SampleSearchLocatorResolver.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.generic.client.web.client.application.locator;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/SearchLocatorResolver.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/SearchLocatorResolver.java
index e3fde5ce220..7a013cb6e7b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/SearchLocatorResolver.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/SearchLocatorResolver.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.generic.client.web.client.application.locator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/ViewLocator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/ViewLocator.java
index 163f8d68301..77b5220ae60 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/ViewLocator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/ViewLocator.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.generic.client.web.client.application.locator;
 
 import java.util.Collections;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/ViewLocatorResolverRegistry.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/ViewLocatorResolverRegistry.java
index edf3a160674..71c9225e765 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/ViewLocatorResolverRegistry.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/ViewLocatorResolverRegistry.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.generic.client.web.client.application.locator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/AbstractActionMenu.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/AbstractActionMenu.java
index a6d9a749500..16ec69f9154 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/AbstractActionMenu.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/AbstractActionMenu.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.generic.client.web.client.application.menu;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.IClientServiceAsync;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/ActionMenu.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/ActionMenu.java
index 46b072e77f5..f451168cc6a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/ActionMenu.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/ActionMenu.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.generic.client.web.client.application.menu;
 
 import com.extjs.gxt.ui.client.event.MenuEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/IActionMenuItem.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/IActionMenuItem.java
index a2f1679ded4..5b79f0fa5b3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/IActionMenuItem.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/IActionMenuItem.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.generic.client.web.client.application.menu;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/ITabActionMenuItemDefinition.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/ITabActionMenuItemDefinition.java
index 4538b79b98f..9ba25ebc2bf 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/ITabActionMenuItemDefinition.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/ITabActionMenuItemDefinition.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.generic.client.web.client.application.menu;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.IClientServiceAsync;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/InfoButton.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/InfoButton.java
index 7ae344ea22e..96f3770b0b6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/InfoButton.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/InfoButton.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.generic.client.web.client.application.menu;
 
 import com.extjs.gxt.ui.client.event.ButtonEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/TabActionMenuItemFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/TabActionMenuItemFactory.java
index 379ed1357f3..5ded3fb3f68 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/TabActionMenuItemFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/TabActionMenuItemFactory.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.generic.client.web.client.application.menu;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.IClientServiceAsync;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/TopMenu.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/TopMenu.java
index ae43bb0b4bb..836122642f8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/TopMenu.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/TopMenu.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.generic.client.web.client.application.menu;
 
 import com.extjs.gxt.ui.client.widget.LayoutContainer;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/TopMenuItem.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/TopMenuItem.java
index 1799bfda771..a7093da1999 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/TopMenuItem.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/TopMenuItem.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.generic.client.web.client.application.menu;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.TextToolItem;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/TrashButton.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/TrashButton.java
index 4bd790e9f16..37171ea658d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/TrashButton.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/TrashButton.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.generic.client.web.client.application.menu;
 
 import com.extjs.gxt.ui.client.event.ButtonEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/ActiveUsersCountAction.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/ActiveUsersCountAction.java
index 8a8fe79be7b..00c0e14ae7e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/ActiveUsersCountAction.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/ActiveUsersCountAction.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.generic.client.web.client.application.menu.administration;
 
 import com.extjs.gxt.ui.client.event.Listener;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/AdministrationMenu.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/AdministrationMenu.java
index dc6cc00bca5..aaa03ca6546 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/AdministrationMenu.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/AdministrationMenu.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.generic.client.web.client.application.menu.administration;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/AuthorizationMenu.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/AuthorizationMenu.java
index 2189acb2e1d..df7e49c56d3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/AuthorizationMenu.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/AuthorizationMenu.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.generic.client.web.client.application.menu.administration;
 
 import com.extjs.gxt.ui.client.widget.menu.Menu;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/PropertyTypesMenu.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/PropertyTypesMenu.java
index 429827f8614..8d7ac94e031 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/PropertyTypesMenu.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/PropertyTypesMenu.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.generic.client.web.client.application.menu.administration;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/TypesMenu.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/TypesMenu.java
index 94fac8a2e35..813defcdd9f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/TypesMenu.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/administration/TypesMenu.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.generic.client.web.client.application.menu.administration;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/modules/ModulesMenu.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/modules/ModulesMenu.java
index 9ae23c7f695..ce29f95c63a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/modules/ModulesMenu.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/modules/ModulesMenu.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.generic.client.web.client.application.menu.modules;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/top/BrowseMenu.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/top/BrowseMenu.java
index d6eafd7991e..4348b552746 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/top/BrowseMenu.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/top/BrowseMenu.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.generic.client.web.client.application.menu.top;
 
 import com.extjs.gxt.ui.client.widget.menu.Menu;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/top/ImportMenu.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/top/ImportMenu.java
index ee6865fd6d9..1840aa131bd 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/top/ImportMenu.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/top/ImportMenu.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.generic.client.web.client.application.menu.top;
 
 import com.extjs.gxt.ui.client.event.MenuEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/top/NewMenu.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/top/NewMenu.java
index 0d16ea42ff9..49df2fdbecb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/top/NewMenu.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/top/NewMenu.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.generic.client.web.client.application.menu.top;
 
 import com.extjs.gxt.ui.client.widget.menu.Menu;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/LoggedUserMenu.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/LoggedUserMenu.java
index e3984f54b2e..a11658ed2c5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/LoggedUserMenu.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/LoggedUserMenu.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.generic.client.web.client.application.menu.user;
 
 import com.extjs.gxt.ui.client.widget.menu.Menu;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/action/AboutBoxAction.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/action/AboutBoxAction.java
index 9d792793d60..79c84348815 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/action/AboutBoxAction.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/action/AboutBoxAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.generic.client.web.client.application.menu.user.action;
 
 import com.extjs.gxt.ui.client.widget.MessageBox;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/action/ChangeUserSettingsAction.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/action/ChangeUserSettingsAction.java
index 6cd4ba278ed..047eadb14e8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/action/ChangeUserSettingsAction.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/action/ChangeUserSettingsAction.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.generic.client.web.client.application.menu.user.action;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/action/LoginAction.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/action/LoginAction.java
index 122d580e51e..58fda241204 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/action/LoginAction.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/action/LoginAction.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.generic.client.web.client.application.menu.user.action;
 
 import com.google.gwt.http.client.UrlBuilder;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/action/LogoutAction.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/action/LogoutAction.java
index d2051bbedad..112eedc819d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/action/LogoutAction.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/action/LogoutAction.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.generic.client.web.client.application.menu.user.action;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/action/LogoutCallback.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/action/LogoutCallback.java
index e6c5ff87425..ab59ee3896f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/action/LogoutCallback.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/user/action/LogoutCallback.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.generic.client.web.client.application.menu.user.action;
 
 import com.google.gwt.user.client.History;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/AttachmentVersionModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/AttachmentVersionModel.java
index d38278a954b..4303bdf8a4b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/AttachmentVersionModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/AttachmentVersionModel.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.generic.client.web.client.application.model;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/AuthorizationGroupModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/AuthorizationGroupModel.java
index 960e45c0ed5..36beb836751 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/AuthorizationGroupModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/AuthorizationGroupModel.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.generic.client.web.client.application.model;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/BaseEntityModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/BaseEntityModel.java
index 674d34e1eee..b9e8e7aedbf 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/BaseEntityModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/BaseEntityModel.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.generic.client.web.client.application.model;
 
 import java.util.HashSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/DataSetKindModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/DataSetKindModel.java
index 1014e0751f9..61a2086b83e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/DataSetKindModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/DataSetKindModel.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.generic.client.web.client.application.model;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/DataSetTypeModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/DataSetTypeModel.java
index 9caed25211a..bc8703d2c3c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/DataSetTypeModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/DataSetTypeModel.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.generic.client.web.client.application.model;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/DataTypeModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/DataTypeModel.java
index 249a25aec59..a7beaf03675 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/DataTypeModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/DataTypeModel.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.generic.client.web.client.application.model;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/DetailedSearchFieldComboModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/DetailedSearchFieldComboModel.java
index 6db73eb071b..2a2301a890d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/DetailedSearchFieldComboModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/DetailedSearchFieldComboModel.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.generic.client.web.client.application.model;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DetailedSearchField;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/EntityVisitModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/EntityVisitModel.java
index 37fef27e18a..9357579e5fb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/EntityVisitModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/EntityVisitModel.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.generic.client.web.client.application.model;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityVisit;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/ExperimentTypeModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/ExperimentTypeModel.java
index 2056dfebc77..a8c5da411e5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/ExperimentTypeModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/ExperimentTypeModel.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.generic.client.web.client.application.model;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/MaterialTypeModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/MaterialTypeModel.java
index 2042763d337..89cfef1c992 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/MaterialTypeModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/MaterialTypeModel.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.generic.client.web.client.application.model;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/ModelDataPropertyNames.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/ModelDataPropertyNames.java
index 676fb2232f5..8803bde354d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/ModelDataPropertyNames.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/ModelDataPropertyNames.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.generic.client.web.client.application.model;
 
 import com.extjs.gxt.ui.client.data.ModelData;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/ParameterValueModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/ParameterValueModel.java
index 4559d418793..380fdf6c786 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/ParameterValueModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/ParameterValueModel.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.generic.client.web.client.application.model;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/PersonModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/PersonModel.java
index 3998e4b5ddf..e22ae003a06 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/PersonModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/PersonModel.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.generic.client.web.client.application.model;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/PluginTaskDescriptionModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/PluginTaskDescriptionModel.java
index 6d1437dec09..d736b5460ec 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/PluginTaskDescriptionModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/PluginTaskDescriptionModel.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.generic.client.web.client.application.model;
 
 import com.extjs.gxt.ui.client.data.ModelData;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SampleTypeModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SampleTypeModel.java
index db05ec7f652..6962bdc5bf8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SampleTypeModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SampleTypeModel.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.generic.client.web.client.application.model;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SearchableEntityModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SearchableEntityModel.java
index 8b29010f839..e078042e72f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SearchableEntityModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SearchableEntityModel.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.generic.client.web.client.application.model;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SimplifiedBaseModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SimplifiedBaseModel.java
index 362a72389c5..fff8e026be7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SimplifiedBaseModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SimplifiedBaseModel.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.generic.client.web.client.application.model;
 
 import com.extjs.gxt.ui.client.data.BaseModel;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SimplifiedBaseModelData.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SimplifiedBaseModelData.java
index 85407b1440e..0bce5d9626c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SimplifiedBaseModelData.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SimplifiedBaseModelData.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.generic.client.web.client.application.model;
 
 import com.extjs.gxt.ui.client.data.BaseModelData;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SpaceModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SpaceModel.java
index fafe4f4ff45..efa724ac165 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SpaceModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SpaceModel.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.generic.client.web.client.application.model;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/VocabularyTermModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/VocabularyTermModel.java
index 6305222a54b..a7350cb95bb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/VocabularyTermModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/VocabularyTermModel.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.generic.client.web.client.application.model;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/renderer/TooltipRenderer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/renderer/TooltipRenderer.java
index ff5ce282684..d60ca5285b9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/renderer/TooltipRenderer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/renderer/TooltipRenderer.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.generic.client.web.client.application.model.renderer;
 
 import ch.systemsx.cisd.common.shared.basic.string.StringUtils;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/renderer/VocabularyPropertyColRenderer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/renderer/VocabularyPropertyColRenderer.java
index 5889eab1731..a2ab76f314e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/renderer/VocabularyPropertyColRenderer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/renderer/VocabularyPropertyColRenderer.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.generic.client.web.client.application.model.renderer;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.ExternalHyperlink;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/ClientPluginAdapter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/ClientPluginAdapter.java
index 4979b9b0db3..c71c9afe950 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/ClientPluginAdapter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/ClientPluginAdapter.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.generic.client.web.client.application.plugin;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/DefaultClientPluginFactoryProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/DefaultClientPluginFactoryProvider.java
index 5532ae04f1c..e6fe8739dbf 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/DefaultClientPluginFactoryProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/DefaultClientPluginFactoryProvider.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.generic.client.web.client.application.plugin;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/IClientPlugin.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/IClientPlugin.java
index 3c886a56b2d..95493677c61 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/IClientPlugin.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/IClientPlugin.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.generic.client.web.client.application.plugin;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/IClientPluginFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/IClientPluginFactory.java
index 93337b2eb3a..d6c3dbe913f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/IClientPluginFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/IClientPluginFactory.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.generic.client.web.client.application.plugin;
 
 import java.util.Set;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/IClientPluginFactoryProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/IClientPluginFactoryProvider.java
index d5a47223808..d78eed54d8f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/IClientPluginFactoryProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/IClientPluginFactoryProvider.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.generic.client.web.client.application.plugin;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.BasicEntityType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/IClientPluginFactoryUsingWildcards.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/IClientPluginFactoryUsingWildcards.java
index bbb666b890b..0aed1c25c90 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/IClientPluginFactoryUsingWildcards.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/IClientPluginFactoryUsingWildcards.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.generic.client.web.client.application.plugin;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/IModule.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/IModule.java
index e855c80572d..681c294bc50 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/IModule.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/IModule.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.generic.client.web.client.application.plugin;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/IModuleInitializationObserver.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/IModuleInitializationObserver.java
index bd44fdb0567..74df1ca92bd 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/IModuleInitializationObserver.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/IModuleInitializationObserver.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.generic.client.web.client.application.plugin;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/ModuleInitializationController.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/ModuleInitializationController.java
index 86c34de86da..911c5f40465 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/ModuleInitializationController.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/ModuleInitializationController.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.generic.client.web.client.application.plugin;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/WildcardSupportingPluginFactoryMap.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/WildcardSupportingPluginFactoryMap.java
index 452a3989fa5..64dfa232814 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/WildcardSupportingPluginFactoryMap.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/WildcardSupportingPluginFactoryMap.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.generic.client.web.client.application.plugin;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.WildcardSupportingMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/DateRenderer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/DateRenderer.java
index 697ea72d9c3..fb12ffbddcc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/DateRenderer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/DateRenderer.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.generic.client.web.client.application.renderer;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/DateStringCellRenderer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/DateStringCellRenderer.java
index d42f9058a30..2fa5feeab33 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/DateStringCellRenderer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/DateStringCellRenderer.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.systemsx.cisd.openbis.generic.client.web.client.application.renderer;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/IRealNumberRenderer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/IRealNumberRenderer.java
index 9b6ff604864..6b38e2d3ba2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/IRealNumberRenderer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/IRealNumberRenderer.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.generic.client.web.client.application.renderer;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/LinkRenderer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/LinkRenderer.java
index ab449ff5cee..fa6a75fe095 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/LinkRenderer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/LinkRenderer.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.generic.client.web.client.application.renderer;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/MaterialRenderer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/MaterialRenderer.java
index d1dda0cf04c..24c5d48d2f8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/MaterialRenderer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/MaterialRenderer.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.generic.client.web.client.application.renderer;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/MultilineStringCellRenderer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/MultilineStringCellRenderer.java
index ba6ed6cdfe2..9bed7c79aae 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/MultilineStringCellRenderer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/MultilineStringCellRenderer.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.client.web.client.application.renderer;
 
 import com.extjs.gxt.ui.client.store.ListStore;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/PersonRenderer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/PersonRenderer.java
index 56b24eba574..affe47457bc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/PersonRenderer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/PersonRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.client.web.client.application.renderer;
 
 import com.extjs.gxt.ui.client.store.ListStore;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/PropertyTypeRenderer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/PropertyTypeRenderer.java
index a33475689a2..a5a0aa62d31 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/PropertyTypeRenderer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/PropertyTypeRenderer.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.generic.client.web.client.application.renderer;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/RealNumberRenderer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/RealNumberRenderer.java
index 341dae77a48..656faf7a109 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/RealNumberRenderer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/RealNumberRenderer.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.client.web.client.application.renderer;
 
 import com.extjs.gxt.ui.client.store.ListStore;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/TimestampStringCellRenderer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/TimestampStringCellRenderer.java
index fa0657f92b1..c0453a81420 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/TimestampStringCellRenderer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/TimestampStringCellRenderer.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.generic.client.web.client.application.renderer;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/VocabularyTermStringCellRenderer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/VocabularyTermStringCellRenderer.java
index c914f90d98a..1ce3368a64d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/VocabularyTermStringCellRenderer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/VocabularyTermStringCellRenderer.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.generic.client.web.client.application.renderer;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/YesNoRenderer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/YesNoRenderer.java
index 88f162d694a..c201902ec37 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/YesNoRenderer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/YesNoRenderer.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2008 - 2023 Zürich, Scientific 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.generic.client.web.client.application.renderer;
 
 import com.extjs.gxt.ui.client.data.ModelData;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/customcolumn/core/CustomColumnJSONClientData.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/customcolumn/core/CustomColumnJSONClientData.java
index 2a23249ff5c..505ebebd475 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/customcolumn/core/CustomColumnJSONClientData.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/customcolumn/core/CustomColumnJSONClientData.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.generic.client.web.client.application.renderer.customcolumn.core;
 
 import com.google.gwt.json.client.JSONObject;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/customcolumn/core/CustomColumnJSONException.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/customcolumn/core/CustomColumnJSONException.java
index 5797bcfcd38..30e27d77ac7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/customcolumn/core/CustomColumnJSONException.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/customcolumn/core/CustomColumnJSONException.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.generic.client.web.client.application.renderer.customcolumn.core;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/customcolumn/core/CustomColumnJSONParser.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/customcolumn/core/CustomColumnJSONParser.java
index bce5c29d904..bf84d7ee146 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/customcolumn/core/CustomColumnJSONParser.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/customcolumn/core/CustomColumnJSONParser.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.generic.client.web.client.application.renderer.customcolumn.core;
 
 import com.google.gwt.json.client.JSONException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/customcolumn/core/CustomColumnMethodRenderer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/customcolumn/core/CustomColumnMethodRenderer.java
index 372b25351a5..6fe5eb639c5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/customcolumn/core/CustomColumnMethodRenderer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/customcolumn/core/CustomColumnMethodRenderer.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.generic.client.web.client.application.renderer.customcolumn.core;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/customcolumn/core/CustomColumnStringRenderer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/customcolumn/core/CustomColumnStringRenderer.java
index 6b44c117ac7..4f53d1705ac 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/customcolumn/core/CustomColumnStringRenderer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/customcolumn/core/CustomColumnStringRenderer.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.generic.client.web.client.application.renderer.customcolumn.core;
 
 import com.extjs.gxt.ui.client.store.ListStore;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/customcolumn/extension/link/CustomColumnLinkRenderer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/customcolumn/extension/link/CustomColumnLinkRenderer.java
index 718ebc20189..00970df6bb2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/customcolumn/extension/link/CustomColumnLinkRenderer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/customcolumn/extension/link/CustomColumnLinkRenderer.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.generic.client.web.client.application.renderer.customcolumn.extension.link;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.renderer.LinkRenderer;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractBatchRegistrationForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractBatchRegistrationForm.java
index cf85ff033bf..d355ca13fca 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractBatchRegistrationForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractBatchRegistrationForm.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.generic.client.web.client.application.ui;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.DatabaseModificationAwareField.wrapUnaware;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractRegistrationForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractRegistrationForm.java
index 493913d0cc2..cbd75f45645 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractRegistrationForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractRegistrationForm.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.generic.client.web.client.application.ui;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractViewer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractViewer.java
index b19d42248af..a5db08a30b9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractViewer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractViewer.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.generic.client.web.client.application.ui;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractViewerWithVerticalSplit.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractViewerWithVerticalSplit.java
index 976f3dc9cb3..a1e2f11399e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractViewerWithVerticalSplit.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractViewerWithVerticalSplit.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.generic.client.web.client.application.ui;
 
 import com.extjs.gxt.ui.client.widget.Component;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AddAuthorizationGroupDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AddAuthorizationGroupDialog.java
index 5f61b57432d..515289b0588 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AddAuthorizationGroupDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AddAuthorizationGroupDialog.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.generic.client.web.client.application.ui;
 
 import com.extjs.gxt.ui.client.widget.Window;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AddSpaceDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AddSpaceDialog.java
index 89f47cd3f5d..df63fdf81ec 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AddSpaceDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AddSpaceDialog.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.generic.client.web.client.application.ui;
 
 import com.extjs.gxt.ui.client.widget.Window;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AuthorizationGroupGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AuthorizationGroupGrid.java
index 07354bb26ec..9577d241953 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AuthorizationGroupGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AuthorizationGroupGrid.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.generic.client.web.client.application.ui;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AuthorizationGroupSelectionWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AuthorizationGroupSelectionWidget.java
index f1613bc219f..401a3db325e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AuthorizationGroupSelectionWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AuthorizationGroupSelectionWidget.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.generic.client.web.client.application.ui;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/BasicLoginCallback.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/BasicLoginCallback.java
index 065b86f3339..8f1761c15cc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/BasicLoginCallback.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/BasicLoginCallback.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.generic.client.web.client.application.ui;
 
 import com.extjs.gxt.ui.client.event.Listener;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/BorderLayoutDataFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/BorderLayoutDataFactory.java
index c77ab8918b1..4e8ce2fb72f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/BorderLayoutDataFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/BorderLayoutDataFactory.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.generic.client.web.client.application.ui;
 
 import com.extjs.gxt.ui.client.Style.LayoutRegion;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/CodesArea.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/CodesArea.java
index 63dc6724429..1eb32ebfa0f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/CodesArea.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/CodesArea.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.generic.client.web.client.application.ui;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ColumnConfigFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ColumnConfigFactory.java
index 95e3a1164a1..804f46541d1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ColumnConfigFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ColumnConfigFactory.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.generic.client.web.client.application.ui;
 
 import com.extjs.gxt.ui.client.widget.grid.ColumnConfig;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ColumnSettingsConfigurer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ColumnSettingsConfigurer.java
index e68c65a292e..757ae574f33 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ColumnSettingsConfigurer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ColumnSettingsConfigurer.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.generic.client.web.client.application.ui;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ComponentEventLogger.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ComponentEventLogger.java
index 7aca7ef2186..501324f7d40 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ComponentEventLogger.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ComponentEventLogger.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.generic.client.web.client.application.ui;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/CustomImportComponent.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/CustomImportComponent.java
index ab47129b19a..8b2a95ab024 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/CustomImportComponent.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/CustomImportComponent.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.generic.client.web.client.application.ui;
 
 import com.extjs.gxt.ui.client.Style.Scroll;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/CustomImportForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/CustomImportForm.java
index 3d644e84981..09d1292e8c3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/CustomImportForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/CustomImportForm.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.generic.client.web.client.application.ui;
 
 import com.extjs.gxt.ui.client.event.BaseEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/CustomImportTypeSelectionWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/CustomImportTypeSelectionWidget.java
index b0149f7973a..3e9446a0033 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/CustomImportTypeSelectionWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/CustomImportTypeSelectionWidget.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.generic.client.web.client.application.ui;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/DisplayedAndSelectedEntities.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/DisplayedAndSelectedEntities.java
index b0905f82cdd..4a4ec5cb582 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/DisplayedAndSelectedEntities.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/DisplayedAndSelectedEntities.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.generic.client.web.client.application.ui;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/EnterKeyListener.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/EnterKeyListener.java
index 8b210fbe645..768872cf7bb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/EnterKeyListener.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/EnterKeyListener.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2008 - 2023 Zürich, Scientific 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.generic.client.web.client.application.ui;
 
 import com.extjs.gxt.ui.client.event.ComponentEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/GeneralImportComponent.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/GeneralImportComponent.java
index 65abb549703..e509fc49e0a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/GeneralImportComponent.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/GeneralImportComponent.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.generic.client.web.client.application.ui;
 
 import com.google.gwt.user.client.ui.Widget;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/LoginPanelAutofill.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/LoginPanelAutofill.java
index 6c2326c9cb3..68b4c879253 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/LoginPanelAutofill.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/LoginPanelAutofill.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.generic.client.web.client.application.ui;
 
 import com.extjs.gxt.ui.client.widget.Text;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/LoginWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/LoginWidget.java
index ebbbb2e4a53..304ca6a8b2c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/LoginWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/LoginWidget.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.generic.client.web.client.application.ui;
 
 import com.extjs.gxt.ui.client.Style.HorizontalAlignment;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ModulesSectionsManager.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ModulesSectionsManager.java
index edb85f16864..c8b60efefc4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ModulesSectionsManager.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ModulesSectionsManager.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.generic.client.web.client.application.ui;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/PersonGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/PersonGrid.java
index eba0fd71e92..bcc38239049 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/PersonGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/PersonGrid.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.generic.client.web.client.application.ui;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/PersonListDeactivationConfirmationDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/PersonListDeactivationConfirmationDialog.java
index 714e0992229..d19a4fb3711 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/PersonListDeactivationConfirmationDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/PersonListDeactivationConfirmationDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.generic.client.web.client.application.ui;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/PersonListDeletionConfirmationDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/PersonListDeletionConfirmationDialog.java
index 01253212d12..005869c6291 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/PersonListDeletionConfirmationDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/PersonListDeletionConfirmationDialog.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.generic.client.web.client.application.ui;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/PersonSelectionWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/PersonSelectionWidget.java
index 8cf678ee717..81ba6b8115c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/PersonSelectionWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/PersonSelectionWidget.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.generic.client.web.client.application.ui;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/PropertyValueRenderers.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/PropertyValueRenderers.java
index a668eb6a873..37cc3a604c0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/PropertyValueRenderers.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/PropertyValueRenderers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.client.web.client.application.ui;
 
 import com.google.gwt.event.dom.client.ClickEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/RoleAssignmentGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/RoleAssignmentGrid.java
index 77862415990..41279516055 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/RoleAssignmentGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/RoleAssignmentGrid.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.generic.client.web.client.application.ui;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/RowLayoutManager.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/RowLayoutManager.java
index a3d387aca08..a3ab387cb3b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/RowLayoutManager.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/RowLayoutManager.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.generic.client.web.client.application.ui;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/SimpleModeHeader.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/SimpleModeHeader.java
index 57ce22495a4..7717c3002f2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/SimpleModeHeader.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/SimpleModeHeader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui;
 
 import com.extjs.gxt.ui.client.event.ButtonEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/SpaceGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/SpaceGrid.java
index 52dac726a7f..208795761a2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/SpaceGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/SpaceGrid.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.generic.client.web.client.application.ui;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/SpaceSelectionWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/SpaceSelectionWidget.java
index ef90ad5977a..b9095046335 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/SpaceSelectionWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/SpaceSelectionWidget.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.generic.client.web.client.application.ui;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/TypedTableGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/TypedTableGrid.java
index 34f249ba675..1e75db9be54 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/TypedTableGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/TypedTableGrid.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.generic.client.web.client.application.ui;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/TypedTableGridColumnDefinitionUI.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/TypedTableGridColumnDefinitionUI.java
index d557d2f3445..40c0b2e9fd4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/TypedTableGridColumnDefinitionUI.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/TypedTableGridColumnDefinitionUI.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.generic.client.web.client.application.ui;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/aggregation/AggregationServiceLocatorResolver.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/aggregation/AggregationServiceLocatorResolver.java
index 121cd07ec7a..75ee7584140 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/aggregation/AggregationServiceLocatorResolver.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/aggregation/AggregationServiceLocatorResolver.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.generic.client.web.client.application.ui.aggregation;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/aggregation/AggregationServicePanel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/aggregation/AggregationServicePanel.java
index 29fd9ab6bd8..cec1af97b0f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/aggregation/AggregationServicePanel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/aggregation/AggregationServicePanel.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.generic.client.web.client.application.ui.aggregation;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddGroupDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddGroupDialog.java
index cd1b3aa8b81..054fb3fb1f7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddGroupDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddGroupDialog.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.generic.client.web.client.application.ui.amc;
 
 import com.extjs.gxt.ui.client.widget.Window;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddPersonDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddPersonDialog.java
index 6a8ef1a04e6..31255c24eef 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddPersonDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddPersonDialog.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.generic.client.web.client.application.ui.amc;
 
 import com.extjs.gxt.ui.client.widget.Window;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddPersonToAuthorizationGroupDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddPersonToAuthorizationGroupDialog.java
index 3e83810dbd1..595ec89833f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddPersonToAuthorizationGroupDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddPersonToAuthorizationGroupDialog.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.generic.client.web.client.application.ui.amc;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddPropertyTypeDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddPropertyTypeDialog.java
index 22677fb8895..5d8f82b16b6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddPropertyTypeDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddPropertyTypeDialog.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.client.web.client.application.ui.amc;
 
 /*
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddRoleAssignmentDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddRoleAssignmentDialog.java
index 5a562d7113b..99d83850601 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddRoleAssignmentDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddRoleAssignmentDialog.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.generic.client.web.client.application.ui.amc;
 
 import com.extjs.gxt.ui.client.event.BaseEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/RoleListBox.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/RoleListBox.java
index a9774963f90..98bde10672d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/RoleListBox.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/RoleListBox.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.generic.client.web.client.application.ui.amc;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/attachment/AttachmentBrowser.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/attachment/AttachmentBrowser.java
index ddd7e22244a..5667dfc4854 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/attachment/AttachmentBrowser.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/attachment/AttachmentBrowser.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.generic.client.web.client.application.ui.attachment;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/attachment/AttachmentDownloadHelper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/attachment/AttachmentDownloadHelper.java
index e654056e331..5934397b46d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/attachment/AttachmentDownloadHelper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/attachment/AttachmentDownloadHelper.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.generic.client.web.client.application.ui.attachment;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.WindowUtils;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/attachment/AttachmentListDeletionConfirmationDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/attachment/AttachmentListDeletionConfirmationDialog.java
index 8196175b7d4..1449d89e8f0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/attachment/AttachmentListDeletionConfirmationDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/attachment/AttachmentListDeletionConfirmationDialog.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.generic.client.web.client.application.ui.attachment;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/framework/IColumnDefinitionUI.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/framework/IColumnDefinitionUI.java
index c7363fc9166..bf82a9b817d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/framework/IColumnDefinitionUI.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/framework/IColumnDefinitionUI.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2008 - 2023 Zürich, Scientific 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.generic.client.web.client.application.ui.columns.framework;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.IColumnDefinition;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/framework/LinkExtractor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/framework/LinkExtractor.java
index fa1b62835c9..0b1e9a8a495 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/framework/LinkExtractor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/framework/LinkExtractor.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.generic.client.web.client.application.ui.columns.framework;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.BasicConstant;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/GridCustomColumnDefinition.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/GridCustomColumnDefinition.java
index 693e87981fb..60cc29387c5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/GridCustomColumnDefinition.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/GridCustomColumnDefinition.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.generic.client.web.client.application.ui.columns.specific;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.framework.IColumnDefinitionUI;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/AbstractExternalDataGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/AbstractExternalDataGrid.java
index dfa4411338e..ba38bc48184 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/AbstractExternalDataGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/AbstractExternalDataGrid.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.generic.client.web.client.application.ui.data;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/ComputationData.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/ComputationData.java
index d95df937a60..909d6afcb5d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/ComputationData.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/ComputationData.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.generic.client.web.client.application.ui.data;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetArchivingMenu.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetArchivingMenu.java
index 88ee7ee69f4..5b1dbbd948e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetArchivingMenu.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetArchivingMenu.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.generic.client.web.client.application.ui.data;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetBatchUpdatePanel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetBatchUpdatePanel.java
index 56a87b87001..cd983064e80 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetBatchUpdatePanel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetBatchUpdatePanel.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.generic.client.web.client.application.ui.data;
 
 import com.extjs.gxt.ui.client.Style.Scroll;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetComputeUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetComputeUtils.java
index b84b6a3df08..e8ac12ac42f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetComputeUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetComputeUtils.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.generic.client.web.client.application.ui.data;
 
 import com.extjs.gxt.ui.client.widget.Window;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetGridUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetGridUtils.java
index 9697807c673..d34bb9cc9d2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetGridUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetGridUtils.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.openbis.generic.client.web.client.application.ui.data;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetListDeletionConfirmationDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetListDeletionConfirmationDialog.java
index c905b07cb28..e4e8a7a0e76 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetListDeletionConfirmationDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetListDeletionConfirmationDialog.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.generic.client.web.client.application.ui.data;
 
 import java.util.Collections;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetParentsArea.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetParentsArea.java
index 7ce3af71eb0..cd8106f5315 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetParentsArea.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetParentsArea.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.generic.client.web.client.application.ui.data;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetProcessingMenu.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetProcessingMenu.java
index ca713cfd10a..a61e6fe2b2f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetProcessingMenu.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetProcessingMenu.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.generic.client.web.client.application.ui.data;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetReportGenerator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetReportGenerator.java
index 44c3d901e58..44c73ae0702 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetReportGenerator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetReportGenerator.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.generic.client.web.client.application.ui.data;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetReportLinkRetriever.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetReportLinkRetriever.java
index 6e993b55f60..f08c762baf9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetReportLinkRetriever.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetReportLinkRetriever.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.generic.client.web.client.application.ui.data;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetSearchHitGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetSearchHitGrid.java
index 8242bceb6ff..ccbf4348b7a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetSearchHitGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetSearchHitGrid.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.
@@ -12,9 +12,7 @@
  * 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.generic.client.web.client.application.ui.data;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetTypeGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetTypeGrid.java
index 26a264e49ef..f1fad72f82e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetTypeGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetTypeGrid.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.generic.client.web.client.application.ui.data;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.createOrDelete;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetTypeSelectionWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetTypeSelectionWidget.java
index 405cd76465f..e68f8836531 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetTypeSelectionWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetTypeSelectionWidget.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.generic.client.web.client.application.ui.data;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.createOrDelete;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetUploadConfirmationDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetUploadConfirmationDialog.java
index ed503a3cda1..a0bfa628888 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetUploadConfirmationDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetUploadConfirmationDialog.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.generic.client.web.client.application.ui.data;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetUploadForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetUploadForm.java
index d5c10175e35..5c93fc2b7be 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetUploadForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetUploadForm.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.generic.client.web.client.application.ui.data;
 
 import com.extjs.gxt.ui.client.event.Events;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetsArea.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetsArea.java
index a30368e3cf6..bb65272f1b4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetsArea.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetsArea.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.generic.client.web.client.application.ui.data;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetsContainedArea.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetsContainedArea.java
index dcc2450e546..d8c1c2025ae 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetsContainedArea.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetsContainedArea.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.generic.client.web.client.application.ui.data;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DatastoreServiceDescriptionModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DatastoreServiceDescriptionModel.java
index d2b43447935..e7b3874d5e1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DatastoreServiceDescriptionModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DatastoreServiceDescriptionModel.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.generic.client.web.client.application.ui.data;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/FileFormatTypeGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/FileFormatTypeGrid.java
index 5be79a1eabb..37a186fbf1f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/FileFormatTypeGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/FileFormatTypeGrid.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-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/FileFormatTypeSelectionWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/FileFormatTypeSelectionWidget.java
index 443fc809d9f..5323ac4451b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/FileFormatTypeSelectionWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/FileFormatTypeSelectionWidget.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.generic.client.web.client.application.ui.data;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/IComputationAction.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/IComputationAction.java
index 4fe313783f7..c38876978ba 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/IComputationAction.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/IComputationAction.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.generic.client.web.client.application.ui.data;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatastoreServiceDescription;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/MatchCriteriaRadio.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/MatchCriteriaRadio.java
index 9ac84392168..e122225de8c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/MatchCriteriaRadio.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/MatchCriteriaRadio.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.generic.client.web.client.application.ui.data;
 
 import com.extjs.gxt.ui.client.Style.HorizontalAlignment;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/PerformComputationDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/PerformComputationDialog.java
index eb558e64bd8..cabbe2aa653 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/PerformComputationDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/PerformComputationDialog.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.generic.client.web.client.application.ui.data;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/ProcessingDisplayCallback.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/ProcessingDisplayCallback.java
index 76f020c34e0..46d2915645f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/ProcessingDisplayCallback.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/ProcessingDisplayCallback.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.generic.client.web.client.application.ui.data;
 
 import com.extjs.gxt.ui.client.widget.MessageBox;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/RelatedDataSetGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/RelatedDataSetGrid.java
index e244949b157..a21dd09c619 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/RelatedDataSetGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/RelatedDataSetGrid.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.
@@ -12,9 +12,7 @@
  * 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.generic.client.web.client.application.ui.data;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/ReportingPluginSelectionWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/ReportingPluginSelectionWidget.java
index d7daa6d79da..129799e47f8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/ReportingPluginSelectionWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/ReportingPluginSelectionWidget.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.generic.client.web.client.application.ui.data;
 
 import java.util.HashSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/SelectedOrAllDataSetsRadioProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/SelectedOrAllDataSetsRadioProvider.java
index 64ed718f73e..0fa1ef0e48e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/SelectedOrAllDataSetsRadioProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/SelectedOrAllDataSetsRadioProvider.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.generic.client.web.client.application.ui.data;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/deletion/DeletionForceCheckBox.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/deletion/DeletionForceCheckBox.java
index 71f845aedb5..2bb538967d7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/deletion/DeletionForceCheckBox.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/deletion/DeletionForceCheckBox.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.generic.client.web.client.application.ui.deletion;
 
 import com.extjs.gxt.ui.client.widget.Label;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/deletion/DeletionForceOptions.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/deletion/DeletionForceOptions.java
index 461125c1abc..e4e3f011c72 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/deletion/DeletionForceOptions.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/deletion/DeletionForceOptions.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.generic.client.web.client.application.ui.deletion;
 
 import com.extjs.gxt.ui.client.event.BaseEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/deletion/DeletionGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/deletion/DeletionGrid.java
index 0b354db8e73..8e702cd8eef 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/deletion/DeletionGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/deletion/DeletionGrid.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.generic.client.web.client.application.ui.deletion;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/deletion/PermanentDeletionConfirmationDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/deletion/PermanentDeletionConfirmationDialog.java
index eca8901e7f9..569c9d50552 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/deletion/PermanentDeletionConfirmationDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/deletion/PermanentDeletionConfirmationDialog.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.generic.client.web.client.application.ui.deletion;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/deletion/RevertDeletionConfirmationDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/deletion/RevertDeletionConfirmationDialog.java
index deee6876cc5..6563fd760c1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/deletion/RevertDeletionConfirmationDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/deletion/RevertDeletionConfirmationDialog.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.generic.client.web.client.application.ui.deletion;
 
 import java.util.Collections;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/entity_type/AbstractEditEntityTypeDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/entity_type/AbstractEditEntityTypeDialog.java
index 291c6213a87..9fe99fcdcb7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/entity_type/AbstractEditEntityTypeDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/entity_type/AbstractEditEntityTypeDialog.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.generic.client.web.client.application.ui.entity_type;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/entity_type/AbstractEntityTypeGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/entity_type/AbstractEntityTypeGrid.java
index 3d5b65966ff..7a8f7932da3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/entity_type/AbstractEntityTypeGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/entity_type/AbstractEntityTypeGrid.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.generic.client.web.client.application.ui.entity_type;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/entity_type/AddEntityTypeDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/entity_type/AddEntityTypeDialog.java
index a1f1c5e60de..08de44cc8da 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/entity_type/AddEntityTypeDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/entity_type/AddEntityTypeDialog.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.generic.client.web.client.application.ui.entity_type;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/entity_type/AddTypeDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/entity_type/AddTypeDialog.java
index e720c3e1025..e20240a232e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/entity_type/AddTypeDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/entity_type/AddTypeDialog.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.generic.client.web.client.application.ui.entity_type;
 
 import com.extjs.gxt.ui.client.widget.form.TextField;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/entity_type/NewEntityTypeForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/entity_type/NewEntityTypeForm.java
index 1c36e0bbccc..43ccfba8f9c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/entity_type/NewEntityTypeForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/entity_type/NewEntityTypeForm.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.client.web.client.application.ui.entity_type;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentBatchRegistrationPanel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentBatchRegistrationPanel.java
index d3c8c5aa46b..d2e14f7084e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentBatchRegistrationPanel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentBatchRegistrationPanel.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.generic.client.web.client.application.ui.experiment;
 
 import com.extjs.gxt.ui.client.Style.Scroll;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentBrowserGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentBrowserGrid.java
index 4ca1181a46c..ce82978e62b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentBrowserGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentBrowserGrid.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.generic.client.web.client.application.ui.experiment;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentBrowserToolbar.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentBrowserToolbar.java
index cd817838d19..deabb0172a1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentBrowserToolbar.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentBrowserToolbar.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.generic.client.web.client.application.ui.experiment;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.createOrDelete;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentDataSetArchivingMenu.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentDataSetArchivingMenu.java
index 8c51bce2229..3bb5a80b581 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentDataSetArchivingMenu.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentDataSetArchivingMenu.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.generic.client.web.client.application.ui.experiment;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentListDeletionConfirmationDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentListDeletionConfirmationDialog.java
index 9669352d058..1a7c5a95257 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentListDeletionConfirmationDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentListDeletionConfirmationDialog.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.generic.client.web.client.application.ui.experiment;
 
 import java.util.Collections;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentRegistrationPanel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentRegistrationPanel.java
index c5e6b7dcb88..dd18efef914 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentRegistrationPanel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentRegistrationPanel.java
@@ -1,11 +1,11 @@
 /*
- * 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.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.experiment;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentTypeGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentTypeGrid.java
index 698994cc394..1c84414a984 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentTypeGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentTypeGrid.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.generic.client.web.client.application.ui.experiment;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.createOrDelete;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentTypeSelectionWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentTypeSelectionWidget.java
index b9aa653ca25..06a6a20efd8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentTypeSelectionWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentTypeSelectionWidget.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.generic.client.web.client.application.ui.experiment;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.createOrDelete;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ProjectSelectionTreeGridContainer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ProjectSelectionTreeGridContainer.java
index 5c2e5fbef08..72c176359eb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ProjectSelectionTreeGridContainer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ProjectSelectionTreeGridContainer.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.generic.client.web.client.application.ui.experiment;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ProjectSelectionWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ProjectSelectionWidget.java
index e725f581f8b..a20e323edb1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ProjectSelectionWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ProjectSelectionWidget.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.generic.client.web.client.application.ui.experiment;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/SelectedOrAllExperimentsRadioProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/SelectedOrAllExperimentsRadioProvider.java
index 99867c2ada0..429f430278e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/SelectedOrAllExperimentsRadioProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/SelectedOrAllExperimentsRadioProvider.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.generic.client.web.client.application.ui.experiment;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/CheckBoxField.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/CheckBoxField.java
index 4529e44662b..1e7809ce738 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/CheckBoxField.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/CheckBoxField.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.generic.client.web.client.application.ui.field;
 
 import com.extjs.gxt.ui.client.widget.form.CheckBox;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/ChosenEntitySetter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/ChosenEntitySetter.java
index fe954a3d515..66e3a0a6f49 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/ChosenEntitySetter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/ChosenEntitySetter.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.generic.client.web.client.application.ui.field;
 
 import java.util.LinkedHashSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/CodeField.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/CodeField.java
index 55ff5cba827..49af9c613a8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/CodeField.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/CodeField.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.generic.client.web.client.application.ui.field;
 
 import com.extjs.gxt.ui.client.widget.form.TriggerField;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/CodeFieldWithGenerator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/CodeFieldWithGenerator.java
index 1af5783e6ce..9f3d94a450c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/CodeFieldWithGenerator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/CodeFieldWithGenerator.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.generic.client.web.client.application.ui.field;
 
 import com.extjs.gxt.ui.client.event.ComponentEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/DataSetChooserField.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/DataSetChooserField.java
index 36f74b8fb5c..494edd18f54 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/DataSetChooserField.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/DataSetChooserField.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.generic.client.web.client.application.ui.field;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/DateDateFormField.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/DateDateFormField.java
index 35ca2775c7a..95b37e8924d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/DateDateFormField.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/DateDateFormField.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.systemsx.cisd.openbis.generic.client.web.client.application.ui.field;
 
 import com.extjs.gxt.ui.client.widget.form.DateField;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/DateFormField.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/DateFormField.java
index 08705674dcd..35d53747ce0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/DateFormField.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/DateFormField.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.generic.client.web.client.application.ui.field;
 
 import com.extjs.gxt.ui.client.widget.form.DateField;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/DescriptionField.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/DescriptionField.java
index 2b29c25a119..53385b309b6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/DescriptionField.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/DescriptionField.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.generic.client.web.client.application.ui.field;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/EntityChooserDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/EntityChooserDialog.java
index c8d69f45361..745d108c1dc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/EntityChooserDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/EntityChooserDialog.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.generic.client.web.client.application.ui.field;
 
 import com.extjs.gxt.ui.client.event.ComponentEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/ExperimentChooserField.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/ExperimentChooserField.java
index 65bf0b0ec05..f3dd1c1e808 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/ExperimentChooserField.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/ExperimentChooserField.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.generic.client.web.client.application.ui.field;
 
 import com.extjs.gxt.ui.client.event.ComponentEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/HyperlinkField.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/HyperlinkField.java
index eb8a80e602a..edbfd2a0a20 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/HyperlinkField.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/HyperlinkField.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.generic.client.web.client.application.ui.field;
 
 import com.extjs.gxt.ui.client.event.ComponentEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/IChosenEntitiesListener.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/IChosenEntitiesListener.java
index abf98e20d67..585654e3c01 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/IChosenEntitiesListener.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/IChosenEntitiesListener.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.generic.client.web.client.application.ui.field;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/IChosenEntitiesProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/IChosenEntitiesProvider.java
index e495bb67d2b..15ba4d5d017 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/IChosenEntitiesProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/IChosenEntitiesProvider.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.generic.client.web.client.application.ui.field;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/IChosenEntitiesSetter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/IChosenEntitiesSetter.java
index e8d06ebe411..d6a169e66c7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/IChosenEntitiesSetter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/IChosenEntitiesSetter.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.generic.client.web.client.application.ui.field;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/IParameterField.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/IParameterField.java
index 3a2d5e626ab..d5e739f883e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/IParameterField.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/IParameterField.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.generic.client.web.client.application.ui.field;
 
 import com.extjs.gxt.ui.client.widget.form.Field;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/IParameterValuesLoader.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/IParameterValuesLoader.java
index a1841ee101f..6001f789167 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/IParameterValuesLoader.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/IParameterValuesLoader.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.generic.client.web.client.application.ui.field;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/IntegerField.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/IntegerField.java
index 50ecefd0f1a..1ca55a20702 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/IntegerField.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/IntegerField.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.generic.client.web.client.application.ui.field;
 
 import com.extjs.gxt.ui.client.widget.form.NumberField;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/MaterialChooserField.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/MaterialChooserField.java
index 3d67e6b4eb8..46efddd8260 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/MaterialChooserField.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/MaterialChooserField.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.generic.client.web.client.application.ui.field;
 
 import com.extjs.gxt.ui.client.event.ComponentEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/MetaprojectArea.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/MetaprojectArea.java
index c595f4d99b4..63cd663937e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/MetaprojectArea.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/MetaprojectArea.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 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.generic.client.web.client.application.ui.field;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/MetaprojectChooserButton.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/MetaprojectChooserButton.java
index 9f3731feee3..d6fb30f4774 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/MetaprojectChooserButton.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/MetaprojectChooserButton.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.generic.client.web.client.application.ui.field;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/MultilineItemsField.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/MultilineItemsField.java
index c8521e30124..37773aaff50 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/MultilineItemsField.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/MultilineItemsField.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.generic.client.web.client.application.ui.field;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/MultilineVarcharField.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/MultilineVarcharField.java
index c766b50edfc..8ef8484e574 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/MultilineVarcharField.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/MultilineVarcharField.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.generic.client.web.client.application.ui.field;
 
 import com.extjs.gxt.ui.client.event.Events;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/ParameterField.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/ParameterField.java
index cf06a21ea71..738263a2d3c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/ParameterField.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/ParameterField.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.generic.client.web.client.application.ui.field;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/PropertyFieldFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/PropertyFieldFactory.java
index c853677d04e..be671a5c6fa 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/PropertyFieldFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/PropertyFieldFactory.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.generic.client.web.client.application.ui.field;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/RealField.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/RealField.java
index cbc459e03a2..7fa21270714 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/RealField.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/RealField.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.generic.client.web.client.application.ui.field;
 
 import com.extjs.gxt.ui.client.widget.form.NumberField;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/ReasonField.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/ReasonField.java
index a874659d634..7e798dc5431 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/ReasonField.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/ReasonField.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.generic.client.web.client.application.ui.field;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/SampleChooserButton.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/SampleChooserButton.java
index 892fa133e04..1a647f49086 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/SampleChooserButton.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/SampleChooserButton.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.generic.client.web.client.application.ui.field;
 
 import java.util.LinkedHashSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/SampleChooserField.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/SampleChooserField.java
index e14534aa326..0fa1664877f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/SampleChooserField.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/SampleChooserField.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.generic.client.web.client.application.ui.field;
 
 import com.extjs.gxt.ui.client.event.ComponentEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/ScriptChooserField.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/ScriptChooserField.java
index 87fdaeed1ec..b48731244a7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/ScriptChooserField.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/ScriptChooserField.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.generic.client.web.client.application.ui.field;
 
 import com.extjs.gxt.ui.client.event.ComponentEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/ScriptField.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/ScriptField.java
index cfd666670af..3b90c7efc58 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/ScriptField.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/ScriptField.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.generic.client.web.client.application.ui.field;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/VarcharField.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/VarcharField.java
index 185a26e2c0c..dae2f4710b7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/VarcharField.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/VarcharField.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.generic.client.web.client.application.ui.field;
 
 import com.extjs.gxt.ui.client.widget.form.TextField;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/VocabularyTermField.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/VocabularyTermField.java
index 1888f7407ad..97c8a1a1d87 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/VocabularyTermField.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/VocabularyTermField.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.generic.client.web.client.application.ui.field;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/VocabularyTermSelectionWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/VocabularyTermSelectionWidget.java
index 51a0e255f8d..dc7f002a33b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/VocabularyTermSelectionWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/VocabularyTermSelectionWidget.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.generic.client.web.client.application.ui.field;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/XmlField.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/XmlField.java
index be73bbaee35..7533036e0e7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/XmlField.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/XmlField.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.generic.client.web.client.application.ui.field;
 
 import com.extjs.gxt.ui.client.event.ComponentEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/file/AttachmentFileUploadField.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/file/AttachmentFileUploadField.java
index 3c3a290e5de..8a684d64fed 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/file/AttachmentFileUploadField.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/file/AttachmentFileUploadField.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.generic.client.web.client.application.ui.file;
 
 import com.extjs.gxt.ui.client.widget.form.FieldSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/file/AttachmentsFileFieldManager.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/file/AttachmentsFileFieldManager.java
index 2ec16529760..8600d2c994d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/file/AttachmentsFileFieldManager.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/file/AttachmentsFileFieldManager.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.generic.client.web.client.application.ui.file;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/file/BasicFileFieldManager.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/file/BasicFileFieldManager.java
index 4d3412a5ea4..6e401b0c8bb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/file/BasicFileFieldManager.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/file/BasicFileFieldManager.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.generic.client.web.client.application.ui.file;
 
 import com.extjs.gxt.ui.client.widget.form.FileUploadField;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/file/FileFieldManager.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/file/FileFieldManager.java
index ef393051bbe..f19f9e7b078 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/file/FileFieldManager.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/file/FileFieldManager.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.generic.client.web.client.application.ui.file;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractColumnSettingsDataModelProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractColumnSettingsDataModelProvider.java
index 09e898adbd6..68256029eb2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractColumnSettingsDataModelProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractColumnSettingsDataModelProvider.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.generic.client.web.client.application.ui.grid;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractEntityGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractEntityGrid.java
index 0efa8d4c299..af569f60cfb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractEntityGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractEntityGrid.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.generic.client.web.client.application.ui.grid;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/BrowserGridPagingToolBar.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/BrowserGridPagingToolBar.java
index 52041ca67da..b4d3047a9f2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/BrowserGridPagingToolBar.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/BrowserGridPagingToolBar.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.generic.client.web.client.application.ui.grid;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnDataModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnDataModel.java
index 29a862b1ec3..e1425dadabe 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnDataModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnDataModel.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.client.web.client.application.ui.grid;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.SimplifiedBaseModelData;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnDefsAndConfigs.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnDefsAndConfigs.java
index 54fc4f64e21..60e7e6e5ccf 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnDefsAndConfigs.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnDefsAndConfigs.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.generic.client.web.client.application.ui.grid;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnListener.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnListener.java
index 1fea5b0833b..0d422211737 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnListener.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnListener.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.generic.client.web.client.application.ui.grid;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnSettingsChooser.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnSettingsChooser.java
index 450117e7dd6..2c9d8d6d362 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnSettingsChooser.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnSettingsChooser.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.client.web.client.application.ui.grid;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnSettingsDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnSettingsDialog.java
index 3a59e18ff52..c37cf337b85 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnSettingsDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnSettingsDialog.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.client.web.client.application.ui.grid;
 
 import com.extjs.gxt.ui.client.event.ButtonEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnUtils.java
index f4500260c93..04aa3856ed1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnUtils.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.generic.client.web.client.application.ui.grid;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/CustomColumnsMetadataProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/CustomColumnsMetadataProvider.java
index 5bbc591e753..aa325e03233 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/CustomColumnsMetadataProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/CustomColumnsMetadataProvider.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.generic.client.web.client.application.ui.grid;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/DisposableComposite.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/DisposableComposite.java
index 9f04e165764..2b198e1eeff 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/DisposableComposite.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/DisposableComposite.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.generic.client.web.client.application.ui.grid;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/DisposableEntityChooser.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/DisposableEntityChooser.java
index a51514f0e82..8fb7f644a65 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/DisposableEntityChooser.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/DisposableEntityChooser.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.generic.client.web.client.application.ui.grid;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ExtendedGridView.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ExtendedGridView.java
index 30108500694..0761cf48493 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ExtendedGridView.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ExtendedGridView.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.generic.client.web.client.application.ui.grid;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/GridUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/GridUtils.java
index 9a41c2dccab..3677971dda0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/GridUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/GridUtils.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.generic.client.web.client.application.ui.grid;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.addAny;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/IBrowserGridActionInvoker.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/IBrowserGridActionInvoker.java
index d1a6e730169..0ec85dfd7a5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/IBrowserGridActionInvoker.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/IBrowserGridActionInvoker.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.client.web.client.application.ui.grid;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ICellListener.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ICellListener.java
index b21ce1562e5..d3609ccc46d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ICellListener.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ICellListener.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.generic.client.web.client.application.ui.grid;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ICellListenerAndLinkGenerator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ICellListenerAndLinkGenerator.java
index 7e2a18f9fad..d208331c048 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ICellListenerAndLinkGenerator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ICellListenerAndLinkGenerator.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.generic.client.web.client.application.ui.grid;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/IColumnDefinitionProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/IColumnDefinitionProvider.java
index 1db4c5a6d36..8c25572a32e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/IColumnDefinitionProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/IColumnDefinitionProvider.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.client.web.client.application.ui.grid;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ICriteriaProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ICriteriaProvider.java
index f4044f1fa75..f7f5fe6a686 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ICriteriaProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ICriteriaProvider.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.generic.client.web.client.application.ui.grid;
 
 import java.util.Set;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/IDisplayTypeIDProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/IDisplayTypeIDProvider.java
index 29743f7003f..22aab5021da 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/IDisplayTypeIDProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/IDisplayTypeIDProvider.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.generic.client.web.client.application.ui.grid;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/IDisposableComponent.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/IDisposableComponent.java
index cf968862c91..2d05574546f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/IDisposableComponent.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/IDisposableComponent.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.generic.client.web.client.application.ui.grid;
 
 import com.extjs.gxt.ui.client.widget.Component;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/IDisposableComponentProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/IDisposableComponentProvider.java
index f332ac9d1ab..0199ebd7e45 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/IDisposableComponentProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/IDisposableComponentProvider.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.generic.client.web.client.application.ui.grid;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ILinkGenerator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ILinkGenerator.java
index 1193780b1eb..dc4908d0836 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ILinkGenerator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ILinkGenerator.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.generic.client.web.client.application.ui.grid;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/IModification.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/IModification.java
index 6e9f4d9237b..605b5fd774f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/IModification.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/IModification.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.generic.client.web.client.application.ui.grid;
 
 public interface IModification
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ListColumnFilterWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ListColumnFilterWidget.java
index 928ff174b31..7c62339191d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ListColumnFilterWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ListColumnFilterWidget.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.generic.client.web.client.application.ui.grid;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/Modification.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/Modification.java
index a7d95f389a8..d2bf4fc2186 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/Modification.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/Modification.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.generic.client.web.client.application.ui.grid;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.lang.StringEscapeUtils;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ModificationsData.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ModificationsData.java
index 854bc636e5a..c622d32f125 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ModificationsData.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ModificationsData.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.generic.client.web.client.application.ui.grid;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/PendingFetchManager.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/PendingFetchManager.java
index 29cc6493695..5edc2ab2d9b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/PendingFetchManager.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/PendingFetchManager.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.generic.client.web.client.application.ui.grid;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ResultSetFetchConfig;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/TableExportType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/TableExportType.java
index 9729eb49ea9..378dd4a386d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/TableExportType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/TableExportType.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.generic.client.web.client.application.ui.grid;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/TextColumnFilterWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/TextColumnFilterWidget.java
index c05c978d703..ea2a3f3a7c3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/TextColumnFilterWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/TextColumnFilterWidget.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.generic.client.web.client.application.ui.grid;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/entity/PropertyTypesCriteria.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/entity/PropertyTypesCriteria.java
index 98aa7b6d3e0..f02e8d7e139 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/entity/PropertyTypesCriteria.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/entity/PropertyTypesCriteria.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.client.web.client.application.ui.grid.entity;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/entity/PropertyTypesCriteriaProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/entity/PropertyTypesCriteriaProvider.java
index f39925dd398..580002cf9cd 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/entity/PropertyTypesCriteriaProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/entity/PropertyTypesCriteriaProvider.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.client.web.client.application.ui.grid.entity;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/entity/PropertyTypesFilterUtil.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/entity/PropertyTypesFilterUtil.java
index f7f6f0e1c03..5dc176ef20a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/entity/PropertyTypesFilterUtil.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/entity/PropertyTypesFilterUtil.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.generic.client.web.client.application.ui.grid.entity;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/column/GridCustomColumnGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/column/GridCustomColumnGrid.java
index c90fa61eead..8557d1164ba 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/column/GridCustomColumnGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/column/GridCustomColumnGrid.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.generic.client.web.client.application.ui.grid.expressions.column;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/common/AbstractGridCustomExpressionEditOrRegisterDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/common/AbstractGridCustomExpressionEditOrRegisterDialog.java
index f6ba2c41836..603e1174d60 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/common/AbstractGridCustomExpressionEditOrRegisterDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/common/AbstractGridCustomExpressionEditOrRegisterDialog.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.generic.client.web.client.application.ui.grid.expressions.common;
 
 import com.extjs.gxt.ui.client.event.BaseEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/common/GridColumnChooser.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/common/GridColumnChooser.java
index 164cc628e92..beb6c7b7ed8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/common/GridColumnChooser.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/common/GridColumnChooser.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.client.web.client.application.ui.grid.expressions.common;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/common/GridColumnChooserDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/common/GridColumnChooserDialog.java
index 4a51ee196ab..ae500157e93 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/common/GridColumnChooserDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/common/GridColumnChooserDialog.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.client.web.client.application.ui.grid.expressions.common;
 
 import com.extjs.gxt.ui.client.event.BaseEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/common/IExpressionHolder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/common/IExpressionHolder.java
index 3c9b55ad696..c322e64f47e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/common/IExpressionHolder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/common/IExpressionHolder.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.generic.client.web.client.application.ui.grid.expressions.common;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterModel.java
index 2f83088c4af..a2e6c002fc4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterModel.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.generic.client.web.client.application.ui.grid.expressions.filter;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterSelectionWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterSelectionWidget.java
index e76185c1dcf..4d70f20fdd4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterSelectionWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterSelectionWidget.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.generic.client.web.client.application.ui.grid.expressions.filter;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterToolbar.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterToolbar.java
index 2d5d5ad9ac0..8e645933585 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterToolbar.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/FilterToolbar.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.client.web.client.application.ui.grid.expressions.filter;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/GridCustomFilterGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/GridCustomFilterGrid.java
index fc98140ee1c..f291c4c6ab5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/GridCustomFilterGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/GridCustomFilterGrid.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.generic.client.web.client.application.ui.grid.expressions.filter;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/IColumnFilterWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/IColumnFilterWidget.java
index 00657f5073f..67edbb7453e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/IColumnFilterWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/IColumnFilterWidget.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.generic.client.web.client.application.ui.grid.expressions.filter;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/listener/OpenEntityDetailsTabAction.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/listener/OpenEntityDetailsTabAction.java
index 5e209e59d6b..b1520794075 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/listener/OpenEntityDetailsTabAction.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/listener/OpenEntityDetailsTabAction.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.generic.client.web.client.application.ui.listener;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/listener/OpenEntityDetailsTabClickListener.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/listener/OpenEntityDetailsTabClickListener.java
index a018c610dc8..2765c34bfc6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/listener/OpenEntityDetailsTabClickListener.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/listener/OpenEntityDetailsTabClickListener.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.generic.client.web.client.application.ui.listener;
 
 import com.google.gwt.event.dom.client.ClickEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/listener/OpenEntityDetailsTabHelper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/listener/OpenEntityDetailsTabHelper.java
index 9dff6ac30b7..25752b88e71 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/listener/OpenEntityDetailsTabHelper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/listener/OpenEntityDetailsTabHelper.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.generic.client.web.client.application.ui.listener;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAsyncCallback;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/listener/OpenEntityEditorTabClickListener.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/listener/OpenEntityEditorTabClickListener.java
index 755063e33b4..6b45381e893 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/listener/OpenEntityEditorTabClickListener.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/listener/OpenEntityEditorTabClickListener.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.generic.client.web.client.application.ui.listener;
 
 import com.google.gwt.event.dom.client.ClickEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/listener/OpenExperimentBrowserTabClickListener.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/listener/OpenExperimentBrowserTabClickListener.java
index a603620e634..8e56d61e5d2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/listener/OpenExperimentBrowserTabClickListener.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/listener/OpenExperimentBrowserTabClickListener.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.generic.client.web.client.application.ui.listener;
 
 import com.google.gwt.event.dom.client.ClickEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/managed_property/ManagedPropertyFormHelper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/managed_property/ManagedPropertyFormHelper.java
index 4518898885e..76aeabfde3b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/managed_property/ManagedPropertyFormHelper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/managed_property/ManagedPropertyFormHelper.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.generic.client.web.client.application.ui.managed_property;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/managed_property/ManagedPropertyGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/managed_property/ManagedPropertyGrid.java
index 9f662faf86e..6798f8c1850 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/managed_property/ManagedPropertyGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/managed_property/ManagedPropertyGrid.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.openbis.generic.client.web.client.application.ui.managed_property;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/managed_property/ManagedPropertyGridActionDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/managed_property/ManagedPropertyGridActionDialog.java
index cc8d1337242..e2887e2d618 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/managed_property/ManagedPropertyGridActionDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/managed_property/ManagedPropertyGridActionDialog.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.generic.client.web.client.application.ui.managed_property;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/managed_property/ManagedPropertyGridGeneratedCallback.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/managed_property/ManagedPropertyGridGeneratedCallback.java
index c43dcd9669b..b6f691a0d3a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/managed_property/ManagedPropertyGridGeneratedCallback.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/managed_property/ManagedPropertyGridGeneratedCallback.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.generic.client.web.client.application.ui.managed_property;
 
 import com.extjs.gxt.ui.client.widget.MessageBox;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialBatchRegistrationUpdatePanel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialBatchRegistrationUpdatePanel.java
index efaca0586c3..7e50c81647b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialBatchRegistrationUpdatePanel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialBatchRegistrationUpdatePanel.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.generic.client.web.client.application.ui.material;
 
 import com.extjs.gxt.ui.client.Style.Scroll;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialBrowserGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialBrowserGrid.java
index 9e0e9a92047..dccf7fc8ef6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialBrowserGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialBrowserGrid.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.generic.client.web.client.application.ui.material;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialBrowserToolbar.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialBrowserToolbar.java
index 0964084d93b..a273e08b535 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialBrowserToolbar.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialBrowserToolbar.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.generic.client.web.client.application.ui.material;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.createOrDelete;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialListDeletionConfirmationDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialListDeletionConfirmationDialog.java
index 52d736df261..eba79b5ee89 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialListDeletionConfirmationDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialListDeletionConfirmationDialog.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.generic.client.web.client.application.ui.material;
 
 import com.extjs.gxt.ui.client.widget.form.RadioGroup;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialTypeGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialTypeGrid.java
index 28741fb1bd8..23b79749f42 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialTypeGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialTypeGrid.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.generic.client.web.client.application.ui.material;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.createOrDelete;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialTypeSelectionWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialTypeSelectionWidget.java
index f99541c6e5a..0d8333b498b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialTypeSelectionWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialTypeSelectionWidget.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.generic.client.web.client.application.ui.material;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.createOrDelete;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/browser/MetaprojectBrowser.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/browser/MetaprojectBrowser.java
index 6ca581239b4..40e30af0f63 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/browser/MetaprojectBrowser.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/browser/MetaprojectBrowser.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.generic.client.web.client.application.ui.metaproject.browser;
 
 import java.util.Set;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/browser/MetaprojectBrowserEntitiesPanel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/browser/MetaprojectBrowserEntitiesPanel.java
index e2effe09143..3db52fae06f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/browser/MetaprojectBrowserEntitiesPanel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/browser/MetaprojectBrowserEntitiesPanel.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.generic.client.web.client.application.ui.metaproject.browser;
 
 import com.extjs.gxt.ui.client.widget.ContentPanel;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/browser/MetaprojectBrowserTreePanel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/browser/MetaprojectBrowserTreePanel.java
index 20cc78e0d7f..af7fb50187a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/browser/MetaprojectBrowserTreePanel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/browser/MetaprojectBrowserTreePanel.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.generic.client.web.client.application.ui.metaproject.browser;
 
 import com.extjs.gxt.ui.client.widget.ContentPanel;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/dialog/MetaprojectDeletionConfirmationDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/dialog/MetaprojectDeletionConfirmationDialog.java
index ebbbbe959f8..d43a17bba52 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/dialog/MetaprojectDeletionConfirmationDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/dialog/MetaprojectDeletionConfirmationDialog.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.generic.client.web.client.application.ui.metaproject.dialog;
 
 import java.util.Collections;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/entity/MetaprojectDataSetsGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/entity/MetaprojectDataSetsGrid.java
index 6aa8141cce3..e5c86088983 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/entity/MetaprojectDataSetsGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/entity/MetaprojectDataSetsGrid.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.generic.client.web.client.application.ui.metaproject.entity;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAsyncCallback;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/entity/MetaprojectDataSetsSection.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/entity/MetaprojectDataSetsSection.java
index 9cfdad1bcc7..83330f3bf2c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/entity/MetaprojectDataSetsSection.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/entity/MetaprojectDataSetsSection.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.generic.client.web.client.application.ui.metaproject.entity;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/entity/MetaprojectEntities.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/entity/MetaprojectEntities.java
index e493b37a123..7666ab573a3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/entity/MetaprojectEntities.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/entity/MetaprojectEntities.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.generic.client.web.client.application.ui.metaproject.entity;
 
 import java.util.LinkedHashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/entity/MetaprojectEntitySection.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/entity/MetaprojectEntitySection.java
index d66bada279b..991ae5a40cc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/entity/MetaprojectEntitySection.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/entity/MetaprojectEntitySection.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.generic.client.web.client.application.ui.metaproject.entity;
 
 import com.extjs.gxt.ui.client.event.BaseEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/entity/MetaprojectExperimentsSection.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/entity/MetaprojectExperimentsSection.java
index 196ffda43c6..14d31459965 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/entity/MetaprojectExperimentsSection.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/entity/MetaprojectExperimentsSection.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.generic.client.web.client.application.ui.metaproject.entity;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/entity/MetaprojectMaterialsSection.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/entity/MetaprojectMaterialsSection.java
index d10c67772c2..05b723f7912 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/entity/MetaprojectMaterialsSection.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/entity/MetaprojectMaterialsSection.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.generic.client.web.client.application.ui.metaproject.entity;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/entity/MetaprojectSamplesSection.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/entity/MetaprojectSamplesSection.java
index 0bbef83668a..c215d80308e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/entity/MetaprojectSamplesSection.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/entity/MetaprojectSamplesSection.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.generic.client.web.client.application.ui.metaproject.entity;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/field/MetaprojectNameField.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/field/MetaprojectNameField.java
index 01a24532270..53b65f8fa13 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/field/MetaprojectNameField.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/field/MetaprojectNameField.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.generic.client.web.client.application.ui.metaproject.field;
 
 import com.extjs.gxt.ui.client.widget.form.TriggerField;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/form/AbstractMetaprojectEditRegisterForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/form/AbstractMetaprojectEditRegisterForm.java
index 8f11e69da9e..fe9c112d312 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/form/AbstractMetaprojectEditRegisterForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/form/AbstractMetaprojectEditRegisterForm.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.generic.client.web.client.application.ui.metaproject.form;
 
 import com.extjs.gxt.ui.client.widget.LayoutContainer;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/form/MetaprojectEditForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/form/MetaprojectEditForm.java
index 390aff393e4..2c0cb634883 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/form/MetaprojectEditForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/form/MetaprojectEditForm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 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.generic.client.web.client.application.ui.metaproject.form;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/grid/MetaprojectGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/grid/MetaprojectGrid.java
index ffdb9a09264..98dd3e52f06 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/grid/MetaprojectGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/grid/MetaprojectGrid.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.generic.client.web.client.application.ui.metaproject.grid;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/MetaprojectTree.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/MetaprojectTree.java
index 6f1b05e9a55..40d1ed23274 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/MetaprojectTree.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/MetaprojectTree.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.generic.client.web.client.application.ui.metaproject.tree;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/model/MetaprojectTreeEntityItemData.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/model/MetaprojectTreeEntityItemData.java
index b171f8dc657..ec03512cf71 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/model/MetaprojectTreeEntityItemData.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/model/MetaprojectTreeEntityItemData.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.generic.client.web.client.application.ui.metaproject.tree.model;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.IEntityInformationHolderWithIdentifier;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/model/MetaprojectTreeEntityKindItemData.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/model/MetaprojectTreeEntityKindItemData.java
index 721649aaa56..4e6c9a8b4fc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/model/MetaprojectTreeEntityKindItemData.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/model/MetaprojectTreeEntityKindItemData.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.generic.client.web.client.application.ui.metaproject.tree.model;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/model/MetaprojectTreeItemData.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/model/MetaprojectTreeItemData.java
index 436afe1a55c..4ff12482512 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/model/MetaprojectTreeItemData.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/model/MetaprojectTreeItemData.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.generic.client.web.client.application.ui.metaproject.tree.model;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.SimplifiedBaseModelData;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/model/MetaprojectTreeMetaprojectItemData.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/model/MetaprojectTreeMetaprojectItemData.java
index 33ba933b948..6d8e0ff65a5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/model/MetaprojectTreeMetaprojectItemData.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/model/MetaprojectTreeMetaprojectItemData.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.generic.client.web.client.application.ui.metaproject.tree.model;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Metaproject;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/widget/MetaprojectTreeEntityItemWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/widget/MetaprojectTreeEntityItemWidget.java
index 4052c1e70e1..b4e8dfa8342 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/widget/MetaprojectTreeEntityItemWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/widget/MetaprojectTreeEntityItemWidget.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.generic.client.web.client.application.ui.metaproject.tree.widget;
 
 import com.google.gwt.event.dom.client.ClickEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/widget/MetaprojectTreeEntityKindItemWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/widget/MetaprojectTreeEntityKindItemWidget.java
index 63df6339cbf..a9dfc01342b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/widget/MetaprojectTreeEntityKindItemWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/widget/MetaprojectTreeEntityKindItemWidget.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.generic.client.web.client.application.ui.metaproject.tree.widget;
 
 import com.google.gwt.user.client.ui.InlineLabel;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/widget/MetaprojectTreeItemWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/widget/MetaprojectTreeItemWidget.java
index 92d11fc9f3c..0899035649d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/widget/MetaprojectTreeItemWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/widget/MetaprojectTreeItemWidget.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.generic.client.web.client.application.ui.metaproject.tree.widget;
 
 import com.google.gwt.user.client.ui.Composite;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/widget/MetaprojectTreeMetaprojectItemWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/widget/MetaprojectTreeMetaprojectItemWidget.java
index a5f0df83425..091aa2e87ad 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/widget/MetaprojectTreeMetaprojectItemWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/tree/widget/MetaprojectTreeMetaprojectItemWidget.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.generic.client.web.client.application.ui.metaproject.tree.widget;
 
 import com.google.gwt.event.dom.client.ClickEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/viewer/MetaprojectPropertiesPanel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/viewer/MetaprojectPropertiesPanel.java
index bd11c87d4bc..a445f3ae627 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/viewer/MetaprojectPropertiesPanel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/viewer/MetaprojectPropertiesPanel.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.generic.client.web.client.application.ui.metaproject.viewer;
 
 import java.util.HashSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/viewer/MetaprojectViewer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/viewer/MetaprojectViewer.java
index 3e08dd5ed77..cef2371b795 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/viewer/MetaprojectViewer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/metaproject/viewer/MetaprojectViewer.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.generic.client.web.client.application.ui.metaproject.viewer;
 
 import java.util.HashSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/project/AbstractProjectEditRegisterForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/project/AbstractProjectEditRegisterForm.java
index 033db7989d6..ef5b8263f76 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/project/AbstractProjectEditRegisterForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/project/AbstractProjectEditRegisterForm.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.generic.client.web.client.application.ui.project;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/project/ProjectEditForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/project/ProjectEditForm.java
index 5ca09dfecc2..4f67fd13442 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/project/ProjectEditForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/project/ProjectEditForm.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.generic.client.web.client.application.ui.project;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/project/ProjectGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/project/ProjectGrid.java
index ab5f959cfe5..233e2db22ba 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/project/ProjectGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/project/ProjectGrid.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.generic.client.web.client.application.ui.project;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/project/ProjectListDeletionConfirmationDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/project/ProjectListDeletionConfirmationDialog.java
index 21cf6102367..058a0978ca9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/project/ProjectListDeletionConfirmationDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/project/ProjectListDeletionConfirmationDialog.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.generic.client.web.client.application.ui.project;
 
 import java.util.Collections;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/project/ProjectRegistrationForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/project/ProjectRegistrationForm.java
index effaa55f2c6..b0e1fee3512 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/project/ProjectRegistrationForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/project/ProjectRegistrationForm.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.generic.client.web.client.application.ui.project;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/AbstractPropertyValueRenderer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/AbstractPropertyValueRenderer.java
index 3a97a6ea231..c3f97f7aa08 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/AbstractPropertyValueRenderer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/AbstractPropertyValueRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.client.web.client.application.ui.property;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/AbstractSimplePropertyValueRenderer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/AbstractSimplePropertyValueRenderer.java
index 68612f3a85a..468e0afb214 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/AbstractSimplePropertyValueRenderer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/AbstractSimplePropertyValueRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.client.web.client.application.ui.property;
 
 import com.google.gwt.user.client.ui.InlineHTML;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/DatePropertyValueRenderer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/DatePropertyValueRenderer.java
index c3be4e83a2b..411ae2ebf93 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/DatePropertyValueRenderer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/DatePropertyValueRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.client.web.client.application.ui.property;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/EntityHistoryGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/EntityHistoryGrid.java
index bc46d917f7d..151f4f0f6d7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/EntityHistoryGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/EntityHistoryGrid.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.generic.client.web.client.application.ui.property;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.IClientServiceAsync;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/IPropertyValueRenderer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/IPropertyValueRenderer.java
index 263ad9665ed..3f984181a72 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/IPropertyValueRenderer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/IPropertyValueRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.client.web.client.application.ui.property;
 
 import com.google.gwt.user.client.ui.Widget;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/ObjectArrayPropertyValueRenderer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/ObjectArrayPropertyValueRenderer.java
index 1f323c9cc45..3f38766ce81 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/ObjectArrayPropertyValueRenderer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/ObjectArrayPropertyValueRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.client.web.client.application.ui.property;
 
 import com.google.gwt.user.client.ui.FlowPanel;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/ObjectPropertyValueRenderer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/ObjectPropertyValueRenderer.java
index 095867cdf18..5887e3c60fc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/ObjectPropertyValueRenderer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/ObjectPropertyValueRenderer.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.openbis.generic.client.web.client.application.ui.property;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/PropertyGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/PropertyGrid.java
index 4a7c2bc8466..c5af5de8792 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/PropertyGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property/PropertyGrid.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.client.web.client.application.ui.property;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/DataTypeSelectionWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/DataTypeSelectionWidget.java
index 43543575160..193914f4fc2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/DataTypeSelectionWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/DataTypeSelectionWidget.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.generic.client.web.client.application.ui.property_type;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/EntityTypePropertyTypeSelectionWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/EntityTypePropertyTypeSelectionWidget.java
index c093ad69713..96e6cc25d11 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/EntityTypePropertyTypeSelectionWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/EntityTypePropertyTypeSelectionWidget.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.generic.client.web.client.application.ui.property_type;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PluginTypeSelectionWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PluginTypeSelectionWidget.java
index 862248ee78d..6c42f1f222c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PluginTypeSelectionWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PluginTypeSelectionWidget.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.generic.client.web.client.application.ui.property_type;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentForm.java
index 1ac53cc6539..2f9640344f2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentForm.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.generic.client.web.client.application.ui.property_type;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentGrid.java
index c7c10afa9ac..de144cbee84 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentGrid.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.generic.client.web.client.application.ui.property_type;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentGridAssignmentsHolder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentGridAssignmentsHolder.java
index 712e9952254..da4310a2f98 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentGridAssignmentsHolder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentGridAssignmentsHolder.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.generic.client.web.client.application.ui.property_type;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeGrid.java
index 30adbe0d46b..33d42e8bade 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeGrid.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.generic.client.web.client.application.ui.property_type;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.createOrDelete;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeListDeletionConfirmationDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeListDeletionConfirmationDialog.java
index ccd971fb36a..b4827c17694 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeListDeletionConfirmationDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeListDeletionConfirmationDialog.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.generic.client.web.client.application.ui.property_type;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeRegistrationForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeRegistrationForm.java
index 4681bd29124..dd26a9e11fc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeRegistrationForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeRegistrationForm.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.generic.client.web.client.application.ui.property_type;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeSelectionWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeSelectionWidget.java
index 49c0a18f15a..1238c488e8d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeSelectionWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeSelectionWidget.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.generic.client.web.client.application.ui.property_type;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/ScriptTypeSelectionWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/ScriptTypeSelectionWidget.java
index ffdf05e4523..b6357dc80c2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/ScriptTypeSelectionWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/ScriptTypeSelectionWidget.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.property_type;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/SectionSelectionWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/SectionSelectionWidget.java
index 174a50604a1..0abbce487ca 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/SectionSelectionWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/SectionSelectionWidget.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.generic.client.web.client.application.ui.property_type;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/report/ReportGeneratedCallback.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/report/ReportGeneratedCallback.java
index e999eeba54d..921aebe3d20 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/report/ReportGeneratedCallback.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/report/ReportGeneratedCallback.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.generic.client.web.client.application.ui.report;
 
 import com.extjs.gxt.ui.client.widget.MessageBox;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/report/ReportGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/report/ReportGrid.java
index 122fdce2ca2..166b7c4f846 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/report/ReportGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/report/ReportGrid.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.openbis.generic.client.web.client.application.ui.report;
 
 import java.util.HashSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/IPropertyTypesProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/IPropertyTypesProvider.java
index fa2e62ab7d3..f0aaf69881a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/IPropertyTypesProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/IPropertyTypesProvider.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.generic.client.web.client.application.ui.sample;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/ISampleCriteriaProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/ISampleCriteriaProvider.java
index 1f042a849fa..9e1543fe731 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/ISampleCriteriaProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/ISampleCriteriaProvider.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.generic.client.web.client.application.ui.sample;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.ICriteriaProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBatchRegisterUpdatePanel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBatchRegisterUpdatePanel.java
index bc87c5f9319..5d10ef6a05d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBatchRegisterUpdatePanel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBatchRegisterUpdatePanel.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.generic.client.web.client.application.ui.sample;
 
 import com.extjs.gxt.ui.client.Style.Scroll;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid.java
index c5a7c89f90c..a5cb0fe5f6a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid.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.generic.client.web.client.application.ui.sample;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserToolbar.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserToolbar.java
index 5e2383f7195..e796894545c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserToolbar.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserToolbar.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.generic.client.web.client.application.ui.sample;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.createOrDelete;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleListDeletionConfirmationDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleListDeletionConfirmationDialog.java
index 20e09dc3cc6..5c4a43c0682 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleListDeletionConfirmationDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleListDeletionConfirmationDialog.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.generic.client.web.client.application.ui.sample;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleRegistrationPanel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleRegistrationPanel.java
index 9f7b40ec4e6..be721d1abce 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleRegistrationPanel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleRegistrationPanel.java
@@ -1,11 +1,11 @@
 /*
- * 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.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.sample;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleRegistrationTypeFilter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleRegistrationTypeFilter.java
index 5866fa37553..e29e9886973 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleRegistrationTypeFilter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleRegistrationTypeFilter.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.generic.client.web.client.application.ui.sample;
 
 import java.util.Iterator;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleSearchHitGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleSearchHitGrid.java
index 613b0e0efca..eca36578e4b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleSearchHitGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleSearchHitGrid.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.
@@ -12,9 +12,7 @@
  * 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.generic.client.web.client.application.ui.sample;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleTypeGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleTypeGrid.java
index 987b038e459..0430e863751 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleTypeGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleTypeGrid.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.generic.client.web.client.application.ui.sample;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.createOrDelete;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleTypeSelectionWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleTypeSelectionWidget.java
index 5645364eb75..8d9392f3afc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleTypeSelectionWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleTypeSelectionWidget.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.generic.client.web.client.application.ui.sample;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.createOrDelete;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SemanticAnnotationGridColumns.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SemanticAnnotationGridColumns.java
index 04d730ad211..277b5602b9f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SemanticAnnotationGridColumns.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SemanticAnnotationGridColumns.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 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.generic.client.web.client.application.ui.sample;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.SemanticAnnotationGridColumnIDs.DESCRIPTOR_ACCESSION_ID;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/AbstractScriptEditRegisterForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/AbstractScriptEditRegisterForm.java
index 5d6c9bd028d..1ec5a74a527 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/AbstractScriptEditRegisterForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/AbstractScriptEditRegisterForm.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.generic.client.web.client.application.ui.script;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/EntityKindSelectionWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/EntityKindSelectionWidget.java
index 5bfc5b97b14..270eee256e6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/EntityKindSelectionWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/EntityKindSelectionWidget.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.generic.client.web.client.application.ui.script;
 
 import com.extjs.gxt.ui.client.widget.form.SimpleComboBox;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/IValidable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/IValidable.java
index 2bdeb1ed5a5..2edc38626e2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/IValidable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/IValidable.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.generic.client.web.client.application.ui.script;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/ScriptEditForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/ScriptEditForm.java
index 9bcb93ba085..f1d7522d33a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/ScriptEditForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/ScriptEditForm.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.generic.client.web.client.application.ui.script;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/ScriptExecutionFramework.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/ScriptExecutionFramework.java
index 5efe6fddeec..f8e4c84c0ea 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/ScriptExecutionFramework.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/ScriptExecutionFramework.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.generic.client.web.client.application.ui.script;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/ScriptGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/ScriptGrid.java
index aa4a532009a..57e77bb58b3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/ScriptGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/ScriptGrid.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.generic.client.web.client.application.ui.script;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/ScriptRegistrationForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/ScriptRegistrationForm.java
index 3f1d7550c40..134670ffe10 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/ScriptRegistrationForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/script/ScriptRegistrationForm.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.generic.client.web.client.application.ui.script;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedDataSetSearchToolbar.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedDataSetSearchToolbar.java
index 7a00edd6aa3..30109431a75 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedDataSetSearchToolbar.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedDataSetSearchToolbar.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.generic.client.web.client.application.ui.search;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchCriteriaWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchCriteriaWidget.java
index eedc5cf269c..ac7d340853d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchCriteriaWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchCriteriaWidget.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.generic.client.web.client.application.ui.search;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchCriterionWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchCriterionWidget.java
index 0129e92a80f..344595a911c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchCriterionWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchCriterionWidget.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.generic.client.web.client.application.ui.search;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchFieldsSelectionWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchFieldsSelectionWidget.java
index fdbe099226f..627f9e0d4fc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchFieldsSelectionWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchFieldsSelectionWidget.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.generic.client.web.client.application.ui.search;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchMainCriteriaWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchMainCriteriaWidget.java
index 2c8f5f9cb34..191b9349cd3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchMainCriteriaWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchMainCriteriaWidget.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.generic.client.web.client.application.ui.search;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchSubCriteriaWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchSubCriteriaWidget.java
index be6c94f5758..c0ef7882897 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchSubCriteriaWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchSubCriteriaWidget.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.generic.client.web.client.application.ui.search;
 
 import java.util.EnumSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchToolbar.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchToolbar.java
index 91d15350e4c..63cb8315d88 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchToolbar.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchToolbar.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.client.web.client.application.ui.search;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchWindow.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchWindow.java
index 4513eb56e32..520332ee906 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchWindow.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchWindow.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.client.web.client.application.ui.search;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/IDetailedSearchHitGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/IDetailedSearchHitGrid.java
index 5f768e006e4..c6662353723 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/IDetailedSearchHitGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/IDetailedSearchHitGrid.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.generic.client.web.client.application.ui.search;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/MatchCriteriaRadio.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/MatchCriteriaRadio.java
index 69b1be989d9..bd0ab475f3e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/MatchCriteriaRadio.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/MatchCriteriaRadio.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.generic.client.web.client.application.ui.search;
 
 import com.extjs.gxt.ui.client.Style.HorizontalAlignment;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/user/ChangeUserSettingsDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/user/ChangeUserSettingsDialog.java
index 91a9e46fc22..a71f8b416ea 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/user/ChangeUserSettingsDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/user/ChangeUserSettingsDialog.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.generic.client.web.client.application.ui.user;
 
 import com.extjs.gxt.ui.client.event.BaseEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/AddVocabularyDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/AddVocabularyDialog.java
index 38f0d728f69..7e5df0508d7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/AddVocabularyDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/AddVocabularyDialog.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.client.web.client.application.ui.vocabulary;
 
 import com.extjs.gxt.ui.client.widget.Label;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyGrid.java
index d5a3a7df1d1..d98fc424299 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyGrid.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.generic.client.web.client.application.ui.vocabulary;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyListDeletionConfirmationDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyListDeletionConfirmationDialog.java
index 024f79102ca..4136a9e0cb6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyListDeletionConfirmationDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyListDeletionConfirmationDialog.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.generic.client.web.client.application.ui.vocabulary;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyRegistrationFieldSet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyRegistrationFieldSet.java
index e0ce14a00f0..330fb2e0a02 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyRegistrationFieldSet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyRegistrationFieldSet.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.generic.client.web.client.application.ui.vocabulary;
 
 import com.extjs.gxt.ui.client.Style.Orientation;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyRegistrationForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyRegistrationForm.java
index c99455e3b7c..bec523e43ba 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyRegistrationForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyRegistrationForm.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.generic.client.web.client.application.ui.vocabulary;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularySelectionWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularySelectionWidget.java
index 8ba9288af6b..cb9cac4c957 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularySelectionWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularySelectionWidget.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.generic.client.web.client.application.ui.vocabulary;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyTermGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyTermGrid.java
index 2fc06ad3867..ab2ca4dcf0c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyTermGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyTermGrid.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.generic.client.web.client.application.ui.vocabulary;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyTermSingleCodeValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyTermSingleCodeValidator.java
index b8f70b290d0..d47e2922b99 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyTermSingleCodeValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyTermSingleCodeValidator.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2008 - 2023 Zürich, Scientific 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.generic.client.web.client.application.ui.vocabulary;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyTermValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyTermValidator.java
index d5a7b00b009..b0ba9a8a923 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyTermValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/VocabularyTermValidator.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2008 - 2023 Zürich, Scientific 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.generic.client.web.client.application.ui.vocabulary;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/webapp/WebAppComponent.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/webapp/WebAppComponent.java
index 3b836a130e7..cb2bb36302c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/webapp/WebAppComponent.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/webapp/WebAppComponent.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.generic.client.web.client.application.ui.webapp;
 
 import com.extjs.gxt.ui.client.widget.WidgetComponent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/webapp/WebAppSortingAndCodeComparator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/webapp/WebAppSortingAndCodeComparator.java
index a5fa7bc8ac3..c3bc18aae33 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/webapp/WebAppSortingAndCodeComparator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/webapp/WebAppSortingAndCodeComparator.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.generic.client.web.client.application.ui.webapp;
 
 import java.util.Comparator;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/webapp/WebAppUrl.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/webapp/WebAppUrl.java
index 419a735f993..96db2dda399 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/webapp/WebAppUrl.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/webapp/WebAppUrl.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.generic.client.web.client.application.ui.webapp;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.URLMethodWithParameters;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/webapp/WebAppUrlParameter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/webapp/WebAppUrlParameter.java
index 09ee0aca86a..460131d0d85 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/webapp/WebAppUrlParameter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/webapp/WebAppUrlParameter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.generic.client.web.client.application.ui.webapp;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractDataConfirmationDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractDataConfirmationDialog.java
index 087e030cf66..8748ca75a16 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractDataConfirmationDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractDataConfirmationDialog.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.generic.client.web.client.application.ui.widget;
 
 import com.extjs.gxt.ui.client.event.ComponentEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractDataListDeletionConfirmationDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractDataListDeletionConfirmationDialog.java
index 5701b2ee9c6..01ba97517c2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractDataListDeletionConfirmationDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractDataListDeletionConfirmationDialog.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.generic.client.web.client.application.ui.widget;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractDataListPermanentDeletionConfirmationDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractDataListPermanentDeletionConfirmationDialog.java
index 2f8512f5fd0..231ec68243d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractDataListPermanentDeletionConfirmationDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractDataListPermanentDeletionConfirmationDialog.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.generic.client.web.client.application.ui.widget;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractDataListTrashDeletionConfirmationDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractDataListTrashDeletionConfirmationDialog.java
index 332cb34856a..b8ae9dcf4a4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractDataListTrashDeletionConfirmationDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractDataListTrashDeletionConfirmationDialog.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.generic.client.web.client.application.ui.widget;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractGridDataRefreshCallback.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractGridDataRefreshCallback.java
index 9c01cf8b0c4..fa08e4dcd35 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractGridDataRefreshCallback.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractGridDataRefreshCallback.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.generic.client.web.client.application.ui.widget;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractRegistrationDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractRegistrationDialog.java
index fdb09b00f5b..71cbf9f703d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractRegistrationDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractRegistrationDialog.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.generic.client.web.client.application.ui.widget;
 
 import com.extjs.gxt.ui.client.widget.Window;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractSaveDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractSaveDialog.java
index 60d6160e776..0a93aefdf43 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractSaveDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/AbstractSaveDialog.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.generic.client.web.client.application.ui.widget;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/ButtonWithConfirmations.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/ButtonWithConfirmations.java
index db447c04e89..6ff73c3ff02 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/ButtonWithConfirmations.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/ButtonWithConfirmations.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.generic.client.web.client.application.ui.widget;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/ButtonWithLoadingMask.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/ButtonWithLoadingMask.java
index 4e9c27d0c1b..61b524a837e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/ButtonWithLoadingMask.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/ButtonWithLoadingMask.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.generic.client.web.client.application.ui.widget;
 
 import com.extjs.gxt.ui.client.Style.Direction;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/CheckBoxGroupWithModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/CheckBoxGroupWithModel.java
index 38038ee6da0..2915e345198 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/CheckBoxGroupWithModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/CheckBoxGroupWithModel.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.generic.client.web.client.application.ui.widget;
 
 import java.util.HashSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/ClickableFormPanel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/ClickableFormPanel.java
index db32cdd7acf..0c61082ce03 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/ClickableFormPanel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/ClickableFormPanel.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.generic.client.web.client.application.ui.widget;
 
 import com.extjs.gxt.ui.client.widget.form.Field;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/ConfirmationDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/ConfirmationDialog.java
index 722ae7601b2..69356693031 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/ConfirmationDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/ConfirmationDialog.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.generic.client.web.client.application.ui.widget;
 
 import com.extjs.gxt.ui.client.widget.Dialog;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/DropDownList.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/DropDownList.java
index 2957b534ef5..cf9b1a6da8c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/DropDownList.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/DropDownList.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.generic.client.web.client.application.ui.widget;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/EntityLinkMessageElement.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/EntityLinkMessageElement.java
index 940cbf70a99..c2da2dc031c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/EntityLinkMessageElement.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/EntityLinkMessageElement.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.generic.client.web.client.application.ui.widget;
 
 import com.google.gwt.event.dom.client.ClickEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/EntityRegistrationPanel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/EntityRegistrationPanel.java
index c07920f91ef..852c0338a7f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/EntityRegistrationPanel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/EntityRegistrationPanel.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.generic.client.web.client.application.ui.widget;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/ExternalHyperlink.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/ExternalHyperlink.java
index 95f8b6090f8..d0c7cdb2079 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/ExternalHyperlink.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/ExternalHyperlink.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.generic.client.web.client.application.ui.widget;
 
 import com.google.gwt.user.client.ui.InlineHTML;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/FieldUtil.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/FieldUtil.java
index 05d24c043cc..6d468f6b70b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/FieldUtil.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/FieldUtil.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.generic.client.web.client.application.ui.widget;
 
 import com.extjs.gxt.ui.client.GXT;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/FormPanelWithSavePoint.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/FormPanelWithSavePoint.java
index f13c79c3cde..3f6d05d9825 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/FormPanelWithSavePoint.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/FormPanelWithSavePoint.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.generic.client.web.client.application.ui.widget;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/HistoryWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/HistoryWidget.java
index 2571f238920..ef4ac30ef92 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/HistoryWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/HistoryWidget.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.generic.client.web.client.application.ui.widget;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/HtmlMessageElement.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/HtmlMessageElement.java
index 58951a8dea3..7f60a2634a8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/HtmlMessageElement.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/HtmlMessageElement.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.generic.client.web.client.application.ui.widget;
 
 import com.google.gwt.user.client.ui.HTML;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/IDataRefreshCallback.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/IDataRefreshCallback.java
index a33bf7da9bd..7a2c1aadf85 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/IDataRefreshCallback.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/IDataRefreshCallback.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.generic.client.web.client.application.ui.widget;
 
 public interface IDataRefreshCallback
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/IInfoHandler.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/IInfoHandler.java
index f726a5c08cf..0fbfd6889fb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/IInfoHandler.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/IInfoHandler.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.generic.client.web.client.application.ui.widget;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/IMessageElement.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/IMessageElement.java
index 53fc32420ef..4b76384e11b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/IMessageElement.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/IMessageElement.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.generic.client.web.client.application.ui.widget;
 
 import com.google.gwt.user.client.ui.Widget;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/InfoBox.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/InfoBox.java
index e502f6c2520..0b42d837535 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/InfoBox.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/InfoBox.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.generic.client.web.client.application.ui.widget;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/InfoType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/InfoType.java
index b5a48b09a9f..2c5a23ba5bc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/InfoType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/InfoType.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.openbis.generic.client.web.client.application.ui.widget;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/InlineHyperlink.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/InlineHyperlink.java
index 98ef50dd0ae..4a6bcc45ef4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/InlineHyperlink.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/InlineHyperlink.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.generic.client.web.client.application.ui.widget;
 
 import com.google.gwt.user.client.ui.Hyperlink;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/LabeledItem.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/LabeledItem.java
index c620e5c9cff..6e1634d3db5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/LabeledItem.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/LabeledItem.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.generic.client.web.client.application.ui.widget;
 
 import com.extjs.gxt.ui.client.widget.form.SimpleComboBox;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/MultilineHTML.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/MultilineHTML.java
index 67cee7986a5..bcc0251afbc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/MultilineHTML.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/MultilineHTML.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.generic.client.web.client.application.ui.widget;
 
 import com.google.gwt.user.client.DOM;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/NotScrollableContainer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/NotScrollableContainer.java
index b91a147b0d0..133b355b036 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/NotScrollableContainer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/NotScrollableContainer.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.generic.client.web.client.application.ui.widget;
 
 import com.extjs.gxt.ui.client.Style.Scroll;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/PopupDialogBasedInfoHandler.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/PopupDialogBasedInfoHandler.java
index 33d62bce8c5..5b5c9318502 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/PopupDialogBasedInfoHandler.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/PopupDialogBasedInfoHandler.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.generic.client.web.client.application.ui.widget;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SampleRegistrationLinkMessageElement.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SampleRegistrationLinkMessageElement.java
index 9fa52b7687e..88eb0bab8c8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SampleRegistrationLinkMessageElement.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SampleRegistrationLinkMessageElement.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.generic.client.web.client.application.ui.widget;
 
 import com.google.gwt.event.dom.client.ClickEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SectionsPanel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SectionsPanel.java
index f0c0cc1f031..3372b99f6f4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SectionsPanel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SectionsPanel.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.client.web.client.application.ui.widget;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SimpleDialog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SimpleDialog.java
index edd57960a35..bc0a38379ff 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SimpleDialog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SimpleDialog.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.generic.client.web.client.application.ui.widget;
 
 import com.extjs.gxt.ui.client.Style.Scroll;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SimpleModelComboBox.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SimpleModelComboBox.java
index 54dddd49dea..c021bd07b44 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SimpleModelComboBox.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SimpleModelComboBox.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.generic.client.web.client.application.ui.widget;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/wizard/IWizardDataModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/wizard/IWizardDataModel.java
index 7923fea31cb..a0465d62894 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/wizard/IWizardDataModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/wizard/IWizardDataModel.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.generic.client.web.client.application.ui.wizard;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/wizard/IWizardState.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/wizard/IWizardState.java
index ca876281970..5752ce4eb07 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/wizard/IWizardState.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/wizard/IWizardState.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.generic.client.web.client.application.ui.wizard;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/wizard/IWizardStateChangeListener.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/wizard/IWizardStateChangeListener.java
index 73bc17d0aaf..ce3313d715a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/wizard/IWizardStateChangeListener.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/wizard/IWizardStateChangeListener.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.generic.client.web.client.application.ui.wizard;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/wizard/Wizard.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/wizard/Wizard.java
index e6883d9d301..e6b7406e89b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/wizard/Wizard.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/wizard/Wizard.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.generic.client.web.client.application.ui.wizard;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/wizard/WizardPage.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/wizard/WizardPage.java
index f25d6fa70d6..e9be540d93d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/wizard/WizardPage.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/wizard/WizardPage.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.generic.client.web.client.application.ui.wizard;
 
 import com.extjs.gxt.ui.client.Style.LayoutRegion;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/wizard/WizardWorkflowModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/wizard/WizardWorkflowModel.java
index a6a8cc96190..1cf7d0d4ed5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/wizard/WizardWorkflowModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/wizard/WizardWorkflowModel.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.generic.client.web.client.application.ui.wizard;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/BorderLayoutHelper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/BorderLayoutHelper.java
index 44241caff23..b36b1e41b49 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/BorderLayoutHelper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/BorderLayoutHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.generic.client.web.client.application.util;
 
 import com.extjs.gxt.ui.client.Style.LayoutRegion;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/CompositeMessageProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/CompositeMessageProvider.java
index 7129d0c507f..406ae22b005 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/CompositeMessageProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/CompositeMessageProvider.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.generic.client.web.client.application.util;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DOMUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DOMUtils.java
index db50bcc4384..dc07a6dc83e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DOMUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DOMUtils.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.generic.client.web.client.application.util;
 
 import com.google.gwt.user.client.DOM;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DataSetUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DataSetUtils.java
index df7d7a86dbf..4e02493d2e6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DataSetUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DataSetUtils.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.generic.client.web.client.application.util;
 
 import ch.systemsx.cisd.common.shared.basic.string.StringUtils;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DialogWithOnlineHelpUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DialogWithOnlineHelpUtils.java
index 69de0153142..5c2671e4464 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DialogWithOnlineHelpUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DialogWithOnlineHelpUtils.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.generic.client.web.client.application.util;
 
 import com.extjs.gxt.ui.client.event.IconButtonEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DictonaryBasedMessageProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DictonaryBasedMessageProvider.java
index 176b1c89406..cd9ee0a5edb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DictonaryBasedMessageProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DictonaryBasedMessageProvider.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.generic.client.web.client.application.util;
 
 import java.util.MissingResourceException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/EntityDeletionConfirmationUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/EntityDeletionConfirmationUtils.java
index 27e4d448574..df2b57f6a41 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/EntityDeletionConfirmationUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/EntityDeletionConfirmationUtils.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.systemsx.cisd.openbis.generic.client.web.client.application.util;
 
 import java.util.HashSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/EntityPropertyUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/EntityPropertyUtils.java
index 3b3a5d1676b..55f30e45502 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/EntityPropertyUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/EntityPropertyUtils.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.generic.client.web.client.application.util;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/EntityTypeUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/EntityTypeUtils.java
index b10e743abac..8ff783474b7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/EntityTypeUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/EntityTypeUtils.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.systemsx.cisd.openbis.generic.client.web.client.application.util;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/GWTUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/GWTUtils.java
index a5c75b2528d..bcc512b0548 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/GWTUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/GWTUtils.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.generic.client.web.client.application.util;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/IDelegatedAction.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/IDelegatedAction.java
index 10bd07481cb..a8af712ac98 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/IDelegatedAction.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/IDelegatedAction.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.generic.client.web.client.application.util;
 
 import com.google.gwt.core.client.Scheduler.ScheduledCommand;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/IDelegatedActionWithResult.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/IDelegatedActionWithResult.java
index d9388160a73..744142eefda 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/IDelegatedActionWithResult.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/IDelegatedActionWithResult.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.generic.client.web.client.application.util;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/IDirectlyConnectedController.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/IDirectlyConnectedController.java
index 22758c864c8..ff0cd501f06 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/IDirectlyConnectedController.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/IDirectlyConnectedController.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.generic.client.web.client.application.util;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/IMessageProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/IMessageProvider.java
index fa9ff052c65..01e49de92f1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/IMessageProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/IMessageProvider.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.generic.client.web.client.application.util;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/IResultUpdater.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/IResultUpdater.java
index b99ea31e436..ad0b47bdd01 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/IResultUpdater.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/IResultUpdater.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.generic.client.web.client.application.util;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/SetUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/SetUtils.java
index de7f2aede03..f752cd2c974 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/SetUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/SetUtils.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.generic.client.web.client.application.util;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/TextToolItem.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/TextToolItem.java
index e5675563e36..3861a190283 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/TextToolItem.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/TextToolItem.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.generic.client.web.client.application.util;
 
 import com.extjs.gxt.ui.client.event.ButtonEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/ToolTipAction.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/ToolTipAction.java
index 6591fe289e2..00441de8d52 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/ToolTipAction.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/ToolTipAction.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.generic.client.web.client.application.util;
 
 import com.extjs.gxt.ui.client.event.ComponentEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/URLListEncoder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/URLListEncoder.java
index 479366a02ed..f4ea1bdc0aa 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/URLListEncoder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/URLListEncoder.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.generic.client.web.client.application.util;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/WidgetUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/WidgetUtils.java
index 532a5cf1619..648b7cc7637 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/WidgetUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/WidgetUtils.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.generic.client.web.client.application.util;
 
 import com.extjs.gxt.ui.client.Style.HorizontalAlignment;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/WindowUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/WindowUtils.java
index 3781c7a9fb9..eca2191889b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/WindowUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/WindowUtils.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.generic.client.web.client.application.util;
 
 import com.extjs.gxt.ui.client.core.XDOM;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/lang/Entities.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/lang/Entities.java
index 41a87d44b6e..7fca2e31750 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/lang/Entities.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/lang/Entities.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.client.web.client.application.util.lang;
 
 /*
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/lang/IntHashMap.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/lang/IntHashMap.java
index d723a2fb50a..682d6c0d1d7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/lang/IntHashMap.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/lang/IntHashMap.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.client.web.client.application.util.lang;
 
 /*
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/lang/StringEscapeUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/lang/StringEscapeUtils.java
index 2c2489f24ce..12655c3ac51 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/lang/StringEscapeUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/lang/StringEscapeUtils.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.
+ */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/log/HostedModeLog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/log/HostedModeLog.java
index a7ee56097c7..91e25a2637c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/log/HostedModeLog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/log/HostedModeLog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.client.web.client.application.util.log;
 
 import com.google.gwt.core.client.Duration;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/log/IProfilingTable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/log/IProfilingTable.java
index 6005f7e4251..58077398284 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/log/IProfilingTable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/log/IProfilingTable.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.generic.client.web.client.application.util.log;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/log/Log.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/log/Log.java
index 70d870e90d7..75f165b514b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/log/Log.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/log/Log.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.client.web.client.application.util.log;
 
 import com.google.gwt.core.client.Duration;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/log/LogImpl.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/log/LogImpl.java
index 02f3bf2a3fa..c7e37de169b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/log/LogImpl.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/log/LogImpl.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.openbis.generic.client.web.client.application.util.log;
 
 import com.google.gwt.core.client.Duration;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/log/LoggingConsole.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/log/LoggingConsole.java
index 2393519d4a5..23a465646e3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/log/LoggingConsole.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/log/LoggingConsole.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.generic.client.web.client.application.util.log;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/log/ProfilingTable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/log/ProfilingTable.java
index 792687f26c3..576ddf79fdc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/log/ProfilingTable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/log/ProfilingTable.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.generic.client.web.client.application.util.log;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/log/WebModeLog.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/log/WebModeLog.java
index 9c83f27bf50..77925f62785 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/log/WebModeLog.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/log/WebModeLog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.client.web.client.application.util.log;
 
 import com.extjs.gxt.ui.client.Style.Scroll;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ApplicationInfo.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ApplicationInfo.java
index a58a18262a0..f229f3630d1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ApplicationInfo.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ApplicationInfo.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.generic.client.web.client.dto;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ArchivingResult.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ArchivingResult.java
index 9d27d50893e..fb80c8d6123 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ArchivingResult.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ArchivingResult.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.generic.client.web.client.dto;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/AttachmentGridColumnIDs.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/AttachmentGridColumnIDs.java
index c3f3758834d..175d7ce15ea 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/AttachmentGridColumnIDs.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/AttachmentGridColumnIDs.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.generic.client.web.client.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/AuthorizationGroupGridColumnIDs.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/AuthorizationGroupGridColumnIDs.java
index da1903de3f6..83d1e497e5c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/AuthorizationGroupGridColumnIDs.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/AuthorizationGroupGridColumnIDs.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.generic.client.web.client.dto;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.AuthorizationGroupGrid;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ColumnDistinctValues.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ColumnDistinctValues.java
index 7fb1e3d2423..8d75ebee147 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ColumnDistinctValues.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ColumnDistinctValues.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.generic.client.web.client.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ColumnIDUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ColumnIDUtils.java
index f859a2f59a6..f529cde18ab 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ColumnIDUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ColumnIDUtils.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.generic.client.web.client.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.TableCellUtil;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/CommonGridColumnIDs.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/CommonGridColumnIDs.java
index 2df7936d460..85d0c4c64b0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/CommonGridColumnIDs.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/CommonGridColumnIDs.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.generic.client.web.client.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/Constants.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/Constants.java
index 8bd4defa633..c66e78471b0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/Constants.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/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.generic.client.web.client.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/CustomFilterInfo.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/CustomFilterInfo.java
index 0c67090b2ae..56f4d79e557 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/CustomFilterInfo.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/CustomFilterInfo.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.generic.client.web.client.dto;
 
 import java.util.Set;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/CustomGridColumnGridColumnIDs.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/CustomGridColumnGridColumnIDs.java
index 7000248f72b..2191a20b9b4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/CustomGridColumnGridColumnIDs.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/CustomGridColumnGridColumnIDs.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.generic.client.web.client.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DataSetTypeGridColumnIDs.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DataSetTypeGridColumnIDs.java
index 384613b7c7d..91cd81a1aed 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DataSetTypeGridColumnIDs.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DataSetTypeGridColumnIDs.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.generic.client.web.client.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DataSetUpdates.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DataSetUpdates.java
index 6c5783c5070..e0d7d3e3841 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DataSetUpdates.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DataSetUpdates.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.generic.client.web.client.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.BasicDataSetUpdates;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DataSetUploadParameters.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DataSetUploadParameters.java
index 8305503d9d8..bc406cb8d36 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DataSetUploadParameters.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DataSetUploadParameters.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.generic.client.web.client.dto;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DefaultResultSetConfig.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DefaultResultSetConfig.java
index 120dfb4b662..d758571d3e3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DefaultResultSetConfig.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DefaultResultSetConfig.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.generic.client.web.client.dto;
 
 import java.util.HashSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DeletionGridColumnIDs.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DeletionGridColumnIDs.java
index cc9916d6484..f057ad26855 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DeletionGridColumnIDs.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DeletionGridColumnIDs.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.generic.client.web.client.dto;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.deletion.DeletionGrid;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DisplayedCriteriaOrSelectedEntityHolder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DisplayedCriteriaOrSelectedEntityHolder.java
index fa9dbf96ab8..0ffcda18716 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DisplayedCriteriaOrSelectedEntityHolder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DisplayedCriteriaOrSelectedEntityHolder.java
@@ -1 +1,82 @@
-/*
 * Copyright 2009 ETH Zuerich, CISD
 *
 * 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.generic.client.web.client.dto;

import java.util.List;

import com.google.gwt.user.client.rpc.IsSerializable;

import ch.systemsx.cisd.openbis.generic.shared.basic.IIdHolder;

/**
 * Contains either a collection of entities or a the criteria to get those entities from the cache.
 * 
 * @author Izabela Adamczyk
 * @author Chandrasekhar Ramakrishnan
 */
public final class DisplayedCriteriaOrSelectedEntityHolder<T extends IIdHolder> implements
        IsSerializable
{

    private TableExportCriteria<T> displayedItemsOrNull;

    private List<T> selectedItemsOrNull;

    public static <T extends IIdHolder> DisplayedCriteriaOrSelectedEntityHolder<T> createSelectedItems(
            List<T> selectedItems)
    {
        return new DisplayedCriteriaOrSelectedEntityHolder<T>(null, selectedItems);
    }

    public static <T extends IIdHolder> DisplayedCriteriaOrSelectedEntityHolder<T> createDisplayedItems(
            TableExportCriteria<T> tableExportCriteria)
    {
        return new DisplayedCriteriaOrSelectedEntityHolder<T>(tableExportCriteria, null);
    }

    private DisplayedCriteriaOrSelectedEntityHolder(TableExportCriteria<T> displayedItemsOrNull,
            List<T> selectedItemsOrNull)
    {
        this.displayedItemsOrNull = displayedItemsOrNull;
        this.selectedItemsOrNull = selectedItemsOrNull;
    }

    public List<T> tryGetSelectedItems()
    {
        return selectedItemsOrNull;
    }

    public TableExportCriteria<T> tryGetDisplayedItems()
    {
        return displayedItemsOrNull;
    }

    /**
     * Call this to test if you should get the selected items or the displayed items.
     * 
     * @return True if I have selected items; false if I have the criteria to get the displayed items.
     */
    public boolean hasSelectedItems()
    {
        return selectedItemsOrNull != null;
    }

    // GWT only
    @Deprecated
    private DisplayedCriteriaOrSelectedEntityHolder()
    {
    }
}
\ No newline at end of file
+/*
+ * Copyright ETH 2011 - 2023 Zürich, Scientific 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.generic.client.web.client.dto;
+
+import java.util.List;
+
+import com.google.gwt.user.client.rpc.IsSerializable;
+
+import ch.systemsx.cisd.openbis.generic.shared.basic.IIdHolder;
+
+/**
+ * Contains either a collection of entities or a the criteria to get those entities from the cache.
+ * 
+ * @author Izabela Adamczyk
+ * @author Chandrasekhar Ramakrishnan
+ */
+public final class DisplayedCriteriaOrSelectedEntityHolder<T extends IIdHolder> implements
+        IsSerializable
+{
+
+    private TableExportCriteria<T> displayedItemsOrNull;
+
+    private List<T> selectedItemsOrNull;
+
+    public static <T extends IIdHolder> DisplayedCriteriaOrSelectedEntityHolder<T> createSelectedItems(
+            List<T> selectedItems)
+    {
+        return new DisplayedCriteriaOrSelectedEntityHolder<T>(null, selectedItems);
+    }
+
+    public static <T extends IIdHolder> DisplayedCriteriaOrSelectedEntityHolder<T> createDisplayedItems(
+            TableExportCriteria<T> tableExportCriteria)
+    {
+        return new DisplayedCriteriaOrSelectedEntityHolder<T>(tableExportCriteria, null);
+    }
+
+    private DisplayedCriteriaOrSelectedEntityHolder(TableExportCriteria<T> displayedItemsOrNull,
+            List<T> selectedItemsOrNull)
+    {
+        this.displayedItemsOrNull = displayedItemsOrNull;
+        this.selectedItemsOrNull = selectedItemsOrNull;
+    }
+
+    public List<T> tryGetSelectedItems()
+    {
+        return selectedItemsOrNull;
+    }
+
+    public TableExportCriteria<T> tryGetDisplayedItems()
+    {
+        return displayedItemsOrNull;
+    }
+
+    /**
+     * Call this to test if you should get the selected items or the displayed items.
+     * 
+     * @return True if I have selected items; false if I have the criteria to get the displayed items.
+     */
+    public boolean hasSelectedItems()
+    {
+        return selectedItemsOrNull != null;
+    }
+
+    // GWT only
+    @Deprecated
+    private DisplayedCriteriaOrSelectedEntityHolder()
+    {
+    }
+}
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DisplayedOrSelectedDatasetCriteria.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DisplayedOrSelectedDatasetCriteria.java
index 46eda40f1b1..e577fa3911b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DisplayedOrSelectedDatasetCriteria.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DisplayedOrSelectedDatasetCriteria.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.generic.client.web.client.dto;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DisplayedOrSelectedIdHolderCriteria.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DisplayedOrSelectedIdHolderCriteria.java
index 3853e06f6be..0c8d2daa23b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DisplayedOrSelectedIdHolderCriteria.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DisplayedOrSelectedIdHolderCriteria.java
@@ -1 +1,73 @@
-/*
 * Copyright 2009 ETH Zuerich, CISD
 *
 * 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.generic.client.web.client.dto;

import java.util.List;

import com.google.gwt.user.client.rpc.IsSerializable;

import ch.systemsx.cisd.openbis.generic.shared.basic.IIdHolder;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;

/**
 * Defines a set of {@link IIdHolder}s by either enumerating their ids or providing the grid configuration for it (together with the cache
 * identifier).
 * 
 * @author Izabela Adamczyk
 */
public final class DisplayedOrSelectedIdHolderCriteria<T extends IIdHolder> implements
        IsSerializable
{

    private TableExportCriteria<T> displayedItemsOrNull;

    private List<TechId> selectedItemsTechIdsOrNull;

    public static <T extends IIdHolder> DisplayedOrSelectedIdHolderCriteria<T> createSelectedItems(
            List<T> displayedItems)
    {
        return new DisplayedOrSelectedIdHolderCriteria<T>(null, TechId.createList(displayedItems));
    }

    public static <T extends IIdHolder> DisplayedOrSelectedIdHolderCriteria<T> createDisplayedItems(
            TableExportCriteria<T> tableExportCriteria)
    {
        return new DisplayedOrSelectedIdHolderCriteria<T>(tableExportCriteria, null);
    }

    private DisplayedOrSelectedIdHolderCriteria(TableExportCriteria<T> displayedItemsOrNull,
            List<TechId> selectedItemsTechIdOrNull)
    {
        this.displayedItemsOrNull = displayedItemsOrNull;
        selectedItemsTechIdsOrNull = selectedItemsTechIdOrNull;
    }

    public List<TechId> tryGetSelectedItems()
    {
        return selectedItemsTechIdsOrNull;
    }

    public TableExportCriteria<T> tryGetDisplayedItems()
    {
        return displayedItemsOrNull;
    }

    // GWT only
    @Deprecated
    private DisplayedOrSelectedIdHolderCriteria()
    {
    }
}
\ No newline at end of file
+/*
+ * 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.
+ * 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.generic.client.web.client.dto;
+
+import java.util.List;
+
+import com.google.gwt.user.client.rpc.IsSerializable;
+
+import ch.systemsx.cisd.openbis.generic.shared.basic.IIdHolder;
+import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
+
+/**
+ * Defines a set of {@link IIdHolder}s by either enumerating their ids or providing the grid configuration for it (together with the cache
+ * identifier).
+ * 
+ * @author Izabela Adamczyk
+ */
+public final class DisplayedOrSelectedIdHolderCriteria<T extends IIdHolder> implements
+        IsSerializable
+{
+
+    private TableExportCriteria<T> displayedItemsOrNull;
+
+    private List<TechId> selectedItemsTechIdsOrNull;
+
+    public static <T extends IIdHolder> DisplayedOrSelectedIdHolderCriteria<T> createSelectedItems(
+            List<T> displayedItems)
+    {
+        return new DisplayedOrSelectedIdHolderCriteria<T>(null, TechId.createList(displayedItems));
+    }
+
+    public static <T extends IIdHolder> DisplayedOrSelectedIdHolderCriteria<T> createDisplayedItems(
+            TableExportCriteria<T> tableExportCriteria)
+    {
+        return new DisplayedOrSelectedIdHolderCriteria<T>(tableExportCriteria, null);
+    }
+
+    private DisplayedOrSelectedIdHolderCriteria(TableExportCriteria<T> displayedItemsOrNull,
+            List<TechId> selectedItemsTechIdOrNull)
+    {
+        this.displayedItemsOrNull = displayedItemsOrNull;
+        selectedItemsTechIdsOrNull = selectedItemsTechIdOrNull;
+    }
+
+    public List<TechId> tryGetSelectedItems()
+    {
+        return selectedItemsTechIdsOrNull;
+    }
+
+    public TableExportCriteria<T> tryGetDisplayedItems()
+    {
+        return displayedItemsOrNull;
+    }
+
+    // GWT only
+    @Deprecated
+    private DisplayedOrSelectedIdHolderCriteria()
+    {
+    }
+}
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/EntityHistoryGridColumnIDs.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/EntityHistoryGridColumnIDs.java
index 13812796b22..670660459b4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/EntityHistoryGridColumnIDs.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/EntityHistoryGridColumnIDs.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.generic.client.web.client.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/EntityPropertyUpdates.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/EntityPropertyUpdates.java
index 6a22f40daee..2fbbb0021dc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/EntityPropertyUpdates.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/EntityPropertyUpdates.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.generic.client.web.client.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/EntityPropertyUpdatesResult.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/EntityPropertyUpdatesResult.java
index 99def95e39e..052c68f9b87 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/EntityPropertyUpdatesResult.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/EntityPropertyUpdatesResult.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.generic.client.web.client.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/EntityTypeGridColumnIDs.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/EntityTypeGridColumnIDs.java
index c0a0b28bce6..40c112fb073 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/EntityTypeGridColumnIDs.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/EntityTypeGridColumnIDs.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.generic.client.web.client.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ExperimentBrowserGridColumnIDs.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ExperimentBrowserGridColumnIDs.java
index 139ec3a77a7..90a30931df8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ExperimentBrowserGridColumnIDs.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ExperimentBrowserGridColumnIDs.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.generic.client.web.client.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ExperimentIdentifier.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ExperimentIdentifier.java
index 00106f9ab6c..129fb872b94 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ExperimentIdentifier.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ExperimentIdentifier.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.generic.client.web.client.dto;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ExternalDataGridColumnIDs.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ExternalDataGridColumnIDs.java
index f1384679b77..dbee1067ae3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ExternalDataGridColumnIDs.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ExternalDataGridColumnIDs.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.generic.client.web.client.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/FileFormatTypeGridColumnIDs.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/FileFormatTypeGridColumnIDs.java
index e8057362c22..a5f05e4a641 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/FileFormatTypeGridColumnIDs.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/FileFormatTypeGridColumnIDs.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.generic.client.web.client.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/GenericConstants.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/GenericConstants.java
index 41847a7990b..d2cdca31da0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/GenericConstants.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/GenericConstants.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.generic.client.web.client.dto;
 
 import com.google.gwt.core.client.GWT;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/GridColumnFilterInfo.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/GridColumnFilterInfo.java
index 8c8bd97c1eb..cd2724f1e94 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/GridColumnFilterInfo.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/GridColumnFilterInfo.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.generic.client.web.client.dto;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/GridCustomColumnInfo.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/GridCustomColumnInfo.java
index e805d7d3563..502b5a5533f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/GridCustomColumnInfo.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/GridCustomColumnInfo.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.generic.client.web.client.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/GridFilters.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/GridFilters.java
index 6d4b9a60fda..63e5e9f2415 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/GridFilters.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/GridFilters.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.generic.client.web.client.dto;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/GridRowModels.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/GridRowModels.java
index 0600bf51357..e89995710da 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/GridRowModels.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/GridRowModels.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.generic.client.web.client.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/IResultSetConfig.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/IResultSetConfig.java
index 27724c85e70..83a33ab393b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/IResultSetConfig.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/IResultSetConfig.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.generic.client.web.client.dto;
 
 import java.util.Set;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/IResultSetHolder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/IResultSetHolder.java
index d3a55a84301..9dfab3c0275 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/IResultSetHolder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/IResultSetHolder.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.generic.client.web.client.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/IUpdateResult.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/IUpdateResult.java
index a890a5640ce..4174067e267 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/IUpdateResult.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/IUpdateResult.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.generic.client.web.client.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListEntityDisplayCriteriaKind.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListEntityDisplayCriteriaKind.java
index 4f6ca91b1aa..08792566277 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListEntityDisplayCriteriaKind.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListEntityDisplayCriteriaKind.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.generic.client.web.client.dto;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListEntityHistoryCriteria.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListEntityHistoryCriteria.java
index b5418d1539e..200f29e77ba 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListEntityHistoryCriteria.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListEntityHistoryCriteria.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.generic.client.web.client.dto;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListExperimentsCriteria.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListExperimentsCriteria.java
index 900bbc0d636..c0268eca0bc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListExperimentsCriteria.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListExperimentsCriteria.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.generic.client.web.client.dto;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListMaterialDisplayCriteria.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListMaterialDisplayCriteria.java
index d6ad97edea3..1f1268df7ac 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListMaterialDisplayCriteria.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListMaterialDisplayCriteria.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.generic.client.web.client.dto;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListMetaprojectsCriteria.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListMetaprojectsCriteria.java
index 7a0bd8fb941..35d82175460 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListMetaprojectsCriteria.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListMetaprojectsCriteria.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.generic.client.web.client.dto;
 
 import java.util.Set;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListPersonsCriteria.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListPersonsCriteria.java
index 57f9b8c5c6b..46fc3a70291 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListPersonsCriteria.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListPersonsCriteria.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.
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListSampleDisplayCriteria.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListSampleDisplayCriteria.java
index bcc9b8f3c8e..8039c4290c2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListSampleDisplayCriteria.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListSampleDisplayCriteria.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.generic.client.web.client.dto;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListSampleDisplayCriteria2.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListSampleDisplayCriteria2.java
index 7f1fd842bbb..239be7bcd72 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListSampleDisplayCriteria2.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListSampleDisplayCriteria2.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.generic.client.web.client.dto;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListScriptsCriteria.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListScriptsCriteria.java
index 53b628fd392..973523c039e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListScriptsCriteria.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ListScriptsCriteria.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.
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/MatchingEntitiesPanelColumnIDs.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/MatchingEntitiesPanelColumnIDs.java
index deb5ba918cd..d144d74256f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/MatchingEntitiesPanelColumnIDs.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/MatchingEntitiesPanelColumnIDs.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.generic.client.web.client.dto;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.MatchingEntitiesPanel;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/MaterialGridColumnIDs.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/MaterialGridColumnIDs.java
index b2025ac609b..113dd0dfca4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/MaterialGridColumnIDs.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/MaterialGridColumnIDs.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.generic.client.web.client.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Material;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/MetaprojectGridColumnIDs.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/MetaprojectGridColumnIDs.java
index b41f08c7a5d..be5d7c0412e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/MetaprojectGridColumnIDs.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/MetaprojectGridColumnIDs.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.generic.client.web.client.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/PersonGridColumnIDs.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/PersonGridColumnIDs.java
index 4d9ce747c8a..dafc322322d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/PersonGridColumnIDs.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/PersonGridColumnIDs.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.generic.client.web.client.dto;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.PersonGrid;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ProjectGridColumnIDs.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ProjectGridColumnIDs.java
index c7da1f69fbc..e0f4318e00f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ProjectGridColumnIDs.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ProjectGridColumnIDs.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.generic.client.web.client.dto;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.project.ProjectGrid;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/PropertyTypeAssignmentGridColumnIDs.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/PropertyTypeAssignmentGridColumnIDs.java
index 1c357c613c8..b35e6d169d3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/PropertyTypeAssignmentGridColumnIDs.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/PropertyTypeAssignmentGridColumnIDs.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.generic.client.web.client.dto;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.property_type.PropertyTypeAssignmentGrid;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/PropertyTypeGridColumnIDs.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/PropertyTypeGridColumnIDs.java
index 67a9e4e36fe..94ce679f524 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/PropertyTypeGridColumnIDs.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/PropertyTypeGridColumnIDs.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.generic.client.web.client.dto;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.property_type.PropertyTypeGrid;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/RelatedDataSetCriteria.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/RelatedDataSetCriteria.java
index 3236509a69e..75f57d434ff 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/RelatedDataSetCriteria.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/RelatedDataSetCriteria.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.generic.client.web.client.dto;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ResultSet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ResultSet.java
index bf41ff4ef6e..365748a5ab5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ResultSet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ResultSet.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.generic.client.web.client.dto;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ResultSetFetchConfig.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ResultSetFetchConfig.java
index 3657e34be0a..a8ceffc29f0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ResultSetFetchConfig.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ResultSetFetchConfig.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.generic.client.web.client.dto;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ResultSetWithEntityTypes.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ResultSetWithEntityTypes.java
index b911d9d4161..d6104200edc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ResultSetWithEntityTypes.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ResultSetWithEntityTypes.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.generic.client.web.client.dto;
 
 import java.util.Set;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/RoleAssignmentGridColumnIDs.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/RoleAssignmentGridColumnIDs.java
index c11dab62fe9..bcc3b1f9d28 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/RoleAssignmentGridColumnIDs.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/RoleAssignmentGridColumnIDs.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.generic.client.web.client.dto;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.RoleAssignmentGrid;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SampleChildrenInfo.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SampleChildrenInfo.java
index 9a559b6b7b6..982353748c3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SampleChildrenInfo.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SampleChildrenInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 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.generic.client.web.client.dto;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SampleGridColumnIDs.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SampleGridColumnIDs.java
index 4f937cb25d2..ff3e3f4cee2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SampleGridColumnIDs.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SampleGridColumnIDs.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.generic.client.web.client.dto;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.sample.SampleBrowserGrid;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SampleTypeGridColumnIDs.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SampleTypeGridColumnIDs.java
index 79421674437..8d64aa0a308 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SampleTypeGridColumnIDs.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SampleTypeGridColumnIDs.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.generic.client.web.client.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SampleUpdates.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SampleUpdates.java
index 96ce4d4cc36..d6d25eed9cc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SampleUpdates.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SampleUpdates.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.generic.client.web.client.dto;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ScriptGridColumnIDs.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ScriptGridColumnIDs.java
index ffce25d405f..df39989da8b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ScriptGridColumnIDs.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ScriptGridColumnIDs.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.generic.client.web.client.dto;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.script.ScriptGrid;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SearchOption.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SearchOption.java
index ca13dc7d430..ed13f9d0541 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SearchOption.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SearchOption.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.systemsx.cisd.openbis.generic.client.web.client.dto;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SearchableEntity.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SearchableEntity.java
index 89485192f25..aba6163b805 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SearchableEntity.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SearchableEntity.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.generic.client.web.client.dto;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SemanticAnnotationGridColumnIDs.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SemanticAnnotationGridColumnIDs.java
index 268fcb2592f..53bbadaa4ff 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SemanticAnnotationGridColumnIDs.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SemanticAnnotationGridColumnIDs.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.generic.client.web.client.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SessionContext.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SessionContext.java
index 8e0e0129500..2a1626b33a6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SessionContext.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SessionContext.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.generic.client.web.client.dto;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SpaceGridColumnIDs.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SpaceGridColumnIDs.java
index bb28891db2e..2130c31f0af 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SpaceGridColumnIDs.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SpaceGridColumnIDs.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.generic.client.web.client.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/TableExportCriteria.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/TableExportCriteria.java
index 85a54aca73f..a0ed15df219 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/TableExportCriteria.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/TableExportCriteria.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.generic.client.web.client.dto;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/TableModelReference.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/TableModelReference.java
index ae996c2971f..a909f07b19b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/TableModelReference.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/TableModelReference.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.generic.client.web.client.dto;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/Type.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/Type.java
index b2f71768b91..d8d2abde302 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/Type.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/Type.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.generic.client.web.client.dto;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/TypedTableResultSet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/TypedTableResultSet.java
index d18cf96e72f..3e7c55a26d6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/TypedTableResultSet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/TypedTableResultSet.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.generic.client.web.client.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/User.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/User.java
index 9e709b7b8e0..1eaaddd16da 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/User.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/User.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.generic.client.web.client.dto;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/VocabularyGridColumnIDs.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/VocabularyGridColumnIDs.java
index 93efb42b827..175427f46ef 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/VocabularyGridColumnIDs.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/VocabularyGridColumnIDs.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.generic.client.web.client.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/exception/InvalidSessionException.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/exception/InvalidSessionException.java
index 4d05d3a9eeb..eceba499081 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/exception/InvalidSessionException.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/exception/InvalidSessionException.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.generic.client.web.client.exception;
 
 import ch.systemsx.cisd.common.shared.basic.exception.IOptionalStackTraceLoggingException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/exception/UserFailureException.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/exception/UserFailureException.java
index e4e301c8d7e..1cc5feec190 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/exception/UserFailureException.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/exception/UserFailureException.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.generic.client.web.client.exception;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java
index a333389152d..2a94b82f11e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.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.generic.client.web.server;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractFileDownloadServlet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractFileDownloadServlet.java
index a3ca5a506ab..3a6eed00c4b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractFileDownloadServlet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractFileDownloadServlet.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.generic.client.web.server;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractOriginalDataProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractOriginalDataProvider.java
index 34445718393..e60a0cd249f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractOriginalDataProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractOriginalDataProvider.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.generic.client.web.server;
 
 import ch.systemsx.cisd.openbis.generic.client.web.server.resultset.IOriginalDataProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractOriginalDataProviderWithoutHeaders.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractOriginalDataProviderWithoutHeaders.java
index f4efa2b7999..8aeba7dc07e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractOriginalDataProviderWithoutHeaders.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractOriginalDataProviderWithoutHeaders.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.generic.client.web.server;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractServlet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractServlet.java
index 50e5e2b38a5..6c0770d5a5e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractServlet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractServlet.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.generic.client.web.server;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AttachmentRegistrationHelper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AttachmentRegistrationHelper.java
index 03c2db6afed..c7d8b42e084 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AttachmentRegistrationHelper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AttachmentRegistrationHelper.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.client.web.server;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/ClientServiceExceptionTranslatingAdvisor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/ClientServiceExceptionTranslatingAdvisor.java
index ff3922da174..76c9ec6dd75 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/ClientServiceExceptionTranslatingAdvisor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/ClientServiceExceptionTranslatingAdvisor.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.generic.client.web.server;
 
 import org.aopalliance.intercept.MethodInterceptor;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java
index 2620a6d6071..4a7b022afce 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.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.generic.client.web.server;
 
 import java.io.Reader;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientServiceServlet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientServiceServlet.java
index cca1242d814..a24e547545c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientServiceServlet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientServiceServlet.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.generic.client.web.server;
 
 import javax.annotation.Resource;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/DownloadServiceServlet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/DownloadServiceServlet.java
index ffdbd7d531f..f9e01fa4bb0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/DownloadServiceServlet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/DownloadServiceServlet.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.generic.client.web.server;
 
 import java.io.BufferedInputStream;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/FileExportServiceServlet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/FileExportServiceServlet.java
index 0bd331c5ee8..b275f54de09 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/FileExportServiceServlet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/FileExportServiceServlet.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.generic.client.web.server;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/FileTemplateServiceServlet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/FileTemplateServiceServlet.java
index bd9d8b94f84..9231fb31867 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/FileTemplateServiceServlet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/FileTemplateServiceServlet.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.generic.client.web.server;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/HelpRedirectServlet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/HelpRedirectServlet.java
index 39885a1dba6..17134db92a5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/HelpRedirectServlet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/HelpRedirectServlet.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.generic.client.web.server;
 
 import javax.annotation.Resource;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/IBasicTableDataProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/IBasicTableDataProvider.java
index 9b7eb58459c..ea99c9ff80b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/IBasicTableDataProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/IBasicTableDataProvider.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.generic.client.web.server;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/ListDataSetSearchOriginalDataProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/ListDataSetSearchOriginalDataProvider.java
index 7d185909f6d..e282da791dd 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/ListDataSetSearchOriginalDataProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/ListDataSetSearchOriginalDataProvider.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.client.web.server;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/ListExperimentsOriginalDataProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/ListExperimentsOriginalDataProvider.java
index fbdba1509a3..c570fc10e9a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/ListExperimentsOriginalDataProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/ListExperimentsOriginalDataProvider.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.generic.client.web.server;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/ListRelatedDataSetOriginalDataProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/ListRelatedDataSetOriginalDataProvider.java
index 49465eda609..ce0c4a5bddb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/ListRelatedDataSetOriginalDataProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/ListRelatedDataSetOriginalDataProvider.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.client.web.server;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/ListSamplesOriginalDataProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/ListSamplesOriginalDataProvider.java
index 3064ccabf18..585ff5478e5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/ListSamplesOriginalDataProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/ListSamplesOriginalDataProvider.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2008 - 2023 Zürich, Scientific 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.generic.client.web.server;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/Message.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/Message.java
index 1ffc344a03a..f5b8c95119a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/Message.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/Message.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.generic.client.web.server;
 
 import org.apache.commons.lang3.StringUtils;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/StringHtmlEscapingPointcutAdvisor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/StringHtmlEscapingPointcutAdvisor.java
index 189f22a249b..e2a1fbab822 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/StringHtmlEscapingPointcutAdvisor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/StringHtmlEscapingPointcutAdvisor.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.generic.client.web.server;
 
 import java.lang.reflect.Method;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/UploadServiceServlet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/UploadServiceServlet.java
index 8848ec7de55..d845b16a11d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/UploadServiceServlet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/UploadServiceServlet.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.generic.client.web.server;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/UploadedFilesBean.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/UploadedFilesBean.java
index 130c130926c..de72d8a7259 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/UploadedFilesBean.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/UploadedFilesBean.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.generic.client.web.server;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/ColumnDefinition.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/ColumnDefinition.java
index a060fb63fab..651a710fc32 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/ColumnDefinition.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/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.openbis.generic.client.web.server.calculator;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/ColumnGroup.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/ColumnGroup.java
index 520665569c5..bd150c05d92 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/ColumnGroup.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/ColumnGroup.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.generic.client.web.server.calculator;
 
 import java.util.Collections;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/ComparableCellValueHelper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/ComparableCellValueHelper.java
index 5aa4ac8b328..c1f5f2670fa 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/ComparableCellValueHelper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/ComparableCellValueHelper.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.generic.client.web.server.calculator;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DateTableCell;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/GridExpressionUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/GridExpressionUtils.java
index 56f1f7e908c..a64f670d421 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/GridExpressionUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/GridExpressionUtils.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.generic.client.web.server.calculator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/ITableDataProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/ITableDataProvider.java
index f0c4f0b61df..62fe452254e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/ITableDataProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/ITableDataProvider.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.generic.client.web.server.calculator;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/Row.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/Row.java
index 44c380331e2..3747a3728fc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/Row.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/Row.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.generic.client.web.server.calculator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/RowCalculator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/RowCalculator.java
index addab7c3127..505878e3677 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/RowCalculator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/RowCalculator.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.generic.client.web.server.calculator;
 
 import java.util.Collections;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/VocabularyColumn.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/VocabularyColumn.java
index 5489df15600..b68bb503879 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/VocabularyColumn.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/VocabularyColumn.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.generic.client.web.server.calculator;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.VocabularyTerm;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/queue/ConsumerQueue.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/queue/ConsumerQueue.java
index a6ec0e6ef46..20be29440b8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/queue/ConsumerQueue.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/queue/ConsumerQueue.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.openbis.generic.client.web.server.queue;
 
 import java.io.StringWriter;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/queue/ConsumerTask.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/queue/ConsumerTask.java
index c8a4760dd47..54364e13f26 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/queue/ConsumerTask.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/queue/ConsumerTask.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.openbis.generic.client.web.server.queue;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractCommonTableModelProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractCommonTableModelProvider.java
index bb018495b02..cbe77c7ea5d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractCommonTableModelProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractCommonTableModelProvider.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.generic.client.web.server.resultset;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractExpressionProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractExpressionProvider.java
index d4d4c3a9236..afdf10700f4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractExpressionProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractExpressionProvider.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.generic.client.web.server.resultset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.CommonGridColumnIDs.MODIFICATION_DATE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractExternalDataProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractExternalDataProvider.java
index a2c526f3b58..5688bc638eb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractExternalDataProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractExternalDataProvider.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.generic.client.web.server.resultset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.CommonGridColumnIDs.MODIFICATION_DATE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractMaterialProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractMaterialProvider.java
index 052e7d81330..16fefbb4d39 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractMaterialProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractMaterialProvider.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.generic.client.web.server.resultset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.CommonGridColumnIDs.MODIFICATION_DATE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractTableModelProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractTableModelProvider.java
index 61562923638..a8ebcef9083 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractTableModelProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractTableModelProvider.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.generic.client.web.server.resultset;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AttachmentVersionsProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AttachmentVersionsProvider.java
index a85d351ec9c..4e52ba309be 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AttachmentVersionsProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AttachmentVersionsProvider.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.generic.client.web.server.resultset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.AttachmentGridColumnIDs.DESCRIPTION;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AuthorizationGroupProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AuthorizationGroupProvider.java
index 2d2e82768e6..2aa872916ba 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AuthorizationGroupProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AuthorizationGroupProvider.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.generic.client.web.server.resultset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.AuthorizationGroupGridColumnIDs.CODE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CacheManager.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CacheManager.java
index 9f727e72a40..348a5c9817e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CacheManager.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CacheManager.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.generic.client.web.server.resultset;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManager.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManager.java
index e9b6072e333..3e0d2c97201 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManager.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManager.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.generic.client.web.server.resultset;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/Column.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/Column.java
index a70b443d877..60785f9461f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/Column.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/Column.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.generic.client.web.server.resultset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ColumnSortUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ColumnSortUtils.java
index b1e3e0350cf..aa160b91618 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ColumnSortUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ColumnSortUtils.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.generic.client.web.server.resultset;
 
 import java.util.Comparator;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CustomGridColumnProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CustomGridColumnProvider.java
index 02081351d09..d23bf21ed36 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CustomGridColumnProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CustomGridColumnProvider.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.generic.client.web.server.resultset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.CustomGridColumnGridColumnIDs.CODE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/DataProviderAdapter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/DataProviderAdapter.java
index 459058061bd..0004ad94669 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/DataProviderAdapter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/DataProviderAdapter.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.generic.client.web.server.resultset;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/DataSetTypeProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/DataSetTypeProvider.java
index 3f73cf96777..912f32213f6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/DataSetTypeProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/DataSetTypeProvider.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.generic.client.web.server.resultset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.DataSetTypeGridColumnIDs.DELETION_DISALLOW;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/DefaultResultSet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/DefaultResultSet.java
index f0c4eb0b7c3..db68c72ba95 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/DefaultResultSet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/DefaultResultSet.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.generic.client.web.server.resultset;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.GridRowModels;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/DeletionsProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/DeletionsProvider.java
index d7222d256be..c7170155484 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/DeletionsProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/DeletionsProvider.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.generic.client.web.server.resultset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.DeletionGridColumnIDs.DELETER;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/EntityHistoryProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/EntityHistoryProvider.java
index 10f51bc2c82..4aa765efab6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/EntityHistoryProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/EntityHistoryProvider.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.generic.client.web.server.resultset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.EntityHistoryGridColumnIDs.AUTHOR;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/EntityTypePropertyTypeBrowserProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/EntityTypePropertyTypeBrowserProvider.java
index 90eb4e02088..93b0677554f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/EntityTypePropertyTypeBrowserProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/EntityTypePropertyTypeBrowserProvider.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.generic.client.web.server.resultset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.CommonGridColumnIDs.MODIFICATION_DATE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/EntityTypePropertyTypeProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/EntityTypePropertyTypeProvider.java
index 5dcf106eafd..16ee78fa7a7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/EntityTypePropertyTypeProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/EntityTypePropertyTypeProvider.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.generic.client.web.server.resultset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.CommonGridColumnIDs.MODIFICATION_DATE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/EntityTypeProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/EntityTypeProvider.java
index ac2ea7915eb..79540bf6f48 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/EntityTypeProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/EntityTypeProvider.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.generic.client.web.server.resultset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.CommonGridColumnIDs.MODIFICATION_DATE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ExperimentProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ExperimentProvider.java
index 29283863baf..bb9c4205b5a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ExperimentProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ExperimentProvider.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.generic.client.web.server.resultset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.CommonGridColumnIDs.MODIFICATION_DATE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/FileFormatTypesProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/FileFormatTypesProvider.java
index ea88ba19f6e..72c4cd48d0b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/FileFormatTypesProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/FileFormatTypesProvider.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.generic.client.web.server.resultset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.FileFormatTypeGridColumnIDs.CODE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/GridCustomFilterProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/GridCustomFilterProvider.java
index 9c31fb9a777..45dab067640 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/GridCustomFilterProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/GridCustomFilterProvider.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.generic.client.web.server.resultset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/IColumnCalculator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/IColumnCalculator.java
index f688292c96e..7b30e3c37e9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/IColumnCalculator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/IColumnCalculator.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.generic.client.web.server.resultset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ICustomColumnsProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ICustomColumnsProvider.java
index 0722886e3a6..6c652d2b53f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ICustomColumnsProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ICustomColumnsProvider.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.generic.client.web.server.resultset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/IOriginalDataProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/IOriginalDataProvider.java
index 72a70dd6f71..c32f61569df 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/IOriginalDataProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/IOriginalDataProvider.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.generic.client.web.server.resultset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/IResultSet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/IResultSet.java
index 09e39fcba83..dd6751cc4ed 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/IResultSet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/IResultSet.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.generic.client.web.server.resultset;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.GridRowModels;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/IResultSetKeyGenerator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/IResultSetKeyGenerator.java
index f3932876044..6a25c27a4c6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/IResultSetKeyGenerator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/IResultSetKeyGenerator.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.generic.client.web.server.resultset;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/IResultSetManager.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/IResultSetManager.java
index 4d4c9eaa3a8..762f04b45a4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/IResultSetManager.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/IResultSetManager.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.generic.client.web.server.resultset;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ITableModelProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ITableModelProvider.java
index 48592c8787a..415dead037d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ITableModelProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ITableModelProvider.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.generic.client.web.server.resultset;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/MatchingEntitiesProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/MatchingEntitiesProvider.java
index 8106e3065be..2e1eca14ed3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/MatchingEntitiesProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/MatchingEntitiesProvider.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.generic.client.web.server.resultset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.MatchingEntitiesPanelColumnIDs.ENTITY_KIND;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/MaterialDisambiguationProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/MaterialDisambiguationProvider.java
index 40ea08faa65..8bb1e27acb4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/MaterialDisambiguationProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/MaterialDisambiguationProvider.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.generic.client.web.server.resultset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.MaterialGridColumnIDs.CODE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/MetaprojectProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/MetaprojectProvider.java
index 8f7ca1b1c2e..0e07de4492c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/MetaprojectProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/MetaprojectProvider.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.generic.client.web.server.resultset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.MetaprojectGridColumnIDs.CREATION_DATE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/PersonsProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/PersonsProvider.java
index b0972900ca7..76200a4f6e8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/PersonsProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/PersonsProvider.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.generic.client.web.server.resultset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.PersonGridColumnIDs.EMAIL;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ProjectsProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ProjectsProvider.java
index 62d128baaec..50e7d3ef1e9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ProjectsProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ProjectsProvider.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.generic.client.web.server.resultset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.CommonGridColumnIDs.MODIFICATION_DATE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/PropertyTypeProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/PropertyTypeProvider.java
index 8473e5abe7c..85d8e0543db 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/PropertyTypeProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/PropertyTypeProvider.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.generic.client.web.server.resultset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.CommonGridColumnIDs.MODIFICATION_DATE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/RoleAssignmentProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/RoleAssignmentProvider.java
index 6672c6178f6..a50fc4ee581 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/RoleAssignmentProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/RoleAssignmentProvider.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.generic.client.web.server.resultset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.RoleAssignmentGridColumnIDs.AUTHORIZATION_GROUP;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SampleProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SampleProvider.java
index c73bcf22df4..ecd0e0f69ae 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SampleProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SampleProvider.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.generic.client.web.server.resultset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.CommonGridColumnIDs.MODIFICATION_DATE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SampleTypeProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SampleTypeProvider.java
index aa700b77848..05aed9ef4c8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SampleTypeProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SampleTypeProvider.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.generic.client.web.server.resultset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.SampleTypeGridColumnIDs.AUTO_GENERATE_CODES_LABEL;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ScriptProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ScriptProvider.java
index 250adbebb04..c5bdba5f912 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ScriptProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ScriptProvider.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.generic.client.web.server.resultset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.CommonGridColumnIDs.MODIFICATION_DATE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SemanticAnnotationProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SemanticAnnotationProvider.java
index 2fe820f8c01..149b6bfda91 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SemanticAnnotationProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SemanticAnnotationProvider.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.generic.client.web.server.resultset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.SemanticAnnotationGridColumnIDs.DESCRIPTOR_ACCESSION_ID;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SpacesProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SpacesProvider.java
index 97b0a6f97ab..d8de3147d22 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SpacesProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SpacesProvider.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.generic.client.web.server.resultset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.CommonGridColumnIDs.MODIFICATION_DATE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/TableData.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/TableData.java
index 95605d8652a..513c3371092 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/TableData.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/TableData.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.generic.client.web.server.resultset;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/TableDataCache.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/TableDataCache.java
index 186848f7191..ae18a9fdb65 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/TableDataCache.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/TableDataCache.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.generic.client.web.server.resultset;
 
 import javax.annotation.PostConstruct;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/TableDataProviderFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/TableDataProviderFactory.java
index 998a1c40140..c9f72c50c99 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/TableDataProviderFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/TableDataProviderFactory.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.generic.client.web.server.resultset;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/TableForUpdateExporter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/TableForUpdateExporter.java
index 95e439d514d..51051d93d28 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/TableForUpdateExporter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/TableForUpdateExporter.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.generic.client.web.server.resultset;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/VocabulariesProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/VocabulariesProvider.java
index 8d9287f1876..67c6916d8dc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/VocabulariesProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/VocabulariesProvider.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.generic.client.web.server.resultset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.CommonGridColumnIDs.MODIFICATION_DATE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/VocabularyTermsProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/VocabularyTermsProvider.java
index ce424dab172..c74811039f1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/VocabularyTermsProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/VocabularyTermsProvider.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.generic.client.web.server.resultset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.CommonGridColumnIDs.MODIFICATION_DATE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/translator/ResultSetTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/translator/ResultSetTranslator.java
index c0e1ac90e3c..2f5601d8547 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/translator/ResultSetTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/translator/ResultSetTranslator.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.generic.client.web.server.translator;
 
 import ch.systemsx.cisd.common.string.ReflectingStringEscaper;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/translator/SearchableEntityTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/translator/SearchableEntityTranslator.java
index 76b46f7309c..cb1ce2601b2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/translator/SearchableEntityTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/translator/SearchableEntityTranslator.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.generic.client.web.server.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/translator/SearchableSearchDomainTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/translator/SearchableSearchDomainTranslator.java
index bf9ef31fa9f..382783bfe65 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/translator/SearchableSearchDomainTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/translator/SearchableSearchDomainTranslator.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.generic.client.web.server.translator;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/translator/UserFailureExceptionTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/translator/UserFailureExceptionTranslator.java
index 89fa7cf23f1..21daf431df9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/translator/UserFailureExceptionTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/translator/UserFailureExceptionTranslator.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.generic.client.web.server.translator;
 
 import org.apache.commons.text.StringEscapeUtils;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/HttpUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/HttpUtils.java
index 34e3113f566..54122a9705c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/HttpUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/HttpUtils.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.generic.client.web.server.util;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/OSKind.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/OSKind.java
index dd358ef5e90..e40a5def444 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/OSKind.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/OSKind.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.generic.client.web.server.util;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/TSVRenderer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/TSVRenderer.java
index 3df22238577..d04492b0725 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/TSVRenderer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/TSVRenderer.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.generic.client.web.server.util;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/TableModelUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/TableModelUtils.java
index 863174f3409..f0ad087a98d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/TableModelUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/TableModelUtils.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.generic.client.web.server.util;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/XMLPropertyTransformer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/XMLPropertyTransformer.java
index 5cdfae61ffc..575d80d1375 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/XMLPropertyTransformer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/XMLPropertyTransformer.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.generic.client.web.server.util;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractASyncAction.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractASyncAction.java
index 1a935057bcd..e8583247f3b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractASyncAction.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractASyncAction.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.generic.server;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractCommonServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractCommonServer.java
index 5b670b707b2..b8c3532a741 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractCommonServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractCommonServer.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.generic.server;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java
index 03274776516..1b6c08dd377 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.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.generic.server;
 
 import java.io.StringWriter;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/AuthenticationServiceHolder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/AuthenticationServiceHolder.java
index 091c4f9e20b..9f44c357c55 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/AuthenticationServiceHolder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/AuthenticationServiceHolder.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.generic.server;
 
 import org.springframework.beans.factory.FactoryBean;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/CacheFilter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/CacheFilter.java
index 4607a18fb72..e847bc83677 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/CacheFilter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/CacheFilter.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.generic.server;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/CommonBusinessObjectFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/CommonBusinessObjectFactory.java
index 05b6669b8dd..33ca7b24e2b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/CommonBusinessObjectFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/CommonBusinessObjectFactory.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.generic.server;
 
 import ch.systemsx.cisd.common.multiplexer.IMultiplexer;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java
index eae701139aa..d6d913598e6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.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.generic.server;
 
 import java.net.UnknownHostException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServerLogger.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServerLogger.java
index abd2f81e63c..4398fe94004 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServerLogger.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServerLogger.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.generic.server;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServiceProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServiceProvider.java
index 08cd1d4d51a..f86f51726f2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServiceProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServiceProvider.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.generic.server;
 
 import ch.systemsx.cisd.openbis.generic.shared.ISessionWorkspaceProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServiceServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServiceServer.java
index 398711b1aa3..141b9cb48b1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServiceServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServiceServer.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.generic.server;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ComponentNames.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ComponentNames.java
index 0732d8f38b9..6a8734a7163 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ComponentNames.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ComponentNames.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.generic.server;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ConcurrentOperation.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ConcurrentOperation.java
index d81e7c2b4fe..7d738a69458 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ConcurrentOperation.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ConcurrentOperation.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.generic.server;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ConcurrentOperationLimit.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ConcurrentOperationLimit.java
index 647912405af..ef5815fa88d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ConcurrentOperationLimit.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ConcurrentOperationLimit.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.generic.server;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ConcurrentOperationLimiter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ConcurrentOperationLimiter.java
index 1c5e2abc3e6..bb0dddfb3a5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ConcurrentOperationLimiter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ConcurrentOperationLimiter.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.systemsx.cisd.openbis.generic.server;
 
 import java.util.HashSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ConcurrentOperationLimiterConfig.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ConcurrentOperationLimiterConfig.java
index 3ce6ee771fb..fb1638a6ca3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ConcurrentOperationLimiterConfig.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ConcurrentOperationLimiterConfig.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.systemsx.cisd.openbis.generic.server;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/DataStoreServiceRegistrator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/DataStoreServiceRegistrator.java
index 42764920c34..91e2ae9f99b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/DataStoreServiceRegistrator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/DataStoreServiceRegistrator.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.generic.server;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/DatabaseLastModificationAdvisor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/DatabaseLastModificationAdvisor.java
index c5e3c016c05..03f3ce0c8fe 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/DatabaseLastModificationAdvisor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/DatabaseLastModificationAdvisor.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.generic.server;
 
 import java.lang.annotation.Annotation;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/DisplaySettingsProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/DisplaySettingsProvider.java
index 41038773c81..6802b2c9dc9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/DisplaySettingsProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/DisplaySettingsProvider.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.generic.server;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ETLEntityOperationChecker.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ETLEntityOperationChecker.java
index f3158ab2c71..fe071f07430 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ETLEntityOperationChecker.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ETLEntityOperationChecker.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.generic.server;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceServer.java
index 8703f60cb6b..7d4565ba9e5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceServer.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.generic.server;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/EntityGroupingDAG.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/EntityGroupingDAG.java
index ea6c3f1e3b1..1ee5317056e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/EntityGroupingDAG.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/EntityGroupingDAG.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.generic.server;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/EntityOperationsInProgress.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/EntityOperationsInProgress.java
index a673a0d2322..0f8a7396c81 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/EntityOperationsInProgress.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/EntityOperationsInProgress.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.generic.server;
 
 import java.util.HashSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/GenericHttpSessionListener.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/GenericHttpSessionListener.java
index 183f6954e39..4e39953afc1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/GenericHttpSessionListener.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/GenericHttpSessionListener.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.generic.server;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/HotDeploymentController.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/HotDeploymentController.java
index 69d225e837d..725f7f08e0a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/HotDeploymentController.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/HotDeploymentController.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.generic.server;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/IASyncAction.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/IASyncAction.java
index cdeb8bde40c..118a56bc9b8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/IASyncAction.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/IASyncAction.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.generic.server;
 
 import java.io.Writer;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ICommonServerForInternalUse.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ICommonServerForInternalUse.java
index 974fd8c84a0..896cd0e2952 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ICommonServerForInternalUse.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ICommonServerForInternalUse.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.generic.server;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/IConcurrentOperationLimiter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/IConcurrentOperationLimiter.java
index c47af090160..7426b0004cb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/IConcurrentOperationLimiter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/IConcurrentOperationLimiter.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.generic.server;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/IDataStoreServiceRegistrator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/IDataStoreServiceRegistrator.java
index 09b793df7aa..c81eaa704e2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/IDataStoreServiceRegistrator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/IDataStoreServiceRegistrator.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.generic.server;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/IETLEntityOperationChecker.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/IETLEntityOperationChecker.java
index 4246d62b925..b5af22d5a45 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/IETLEntityOperationChecker.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/IETLEntityOperationChecker.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.generic.server;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/IHotDeploymentController.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/IHotDeploymentController.java
index e49cea179db..9b4971d2cab 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/IHotDeploymentController.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/IHotDeploymentController.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.generic.server;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/JythonEvaluatorPool.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/JythonEvaluatorPool.java
index 9e9992a2071..ee79d21bbe8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/JythonEvaluatorPool.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/JythonEvaluatorPool.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.generic.server;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/LoggerNameFilter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/LoggerNameFilter.java
index 2e6dcfcfa3b..ee7134548fc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/LoggerNameFilter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/LoggerNameFilter.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.generic.server;
 
 import org.apache.log4j.spi.Filter;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/LongRunningThreadAdvisor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/LongRunningThreadAdvisor.java
index c68c4bc0e94..691c1b2c004 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/LongRunningThreadAdvisor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/LongRunningThreadAdvisor.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.generic.server;
 
 import org.aopalliance.aop.Advice;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/LongRunningThreadInterceptor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/LongRunningThreadInterceptor.java
index b7150488ff7..c2ff4ddf89a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/LongRunningThreadInterceptor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/LongRunningThreadInterceptor.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.generic.server;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/LongRunningThreadLogConfiguration.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/LongRunningThreadLogConfiguration.java
index a192915577c..d8cd4c3a7c6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/LongRunningThreadLogConfiguration.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/LongRunningThreadLogConfiguration.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.generic.server;
 
 import ch.systemsx.cisd.common.logging.ControlFileBasedLogConfiguration;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/LongRunningThreadLogger.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/LongRunningThreadLogger.java
index a9a4d4ab40c..a8b56d026bc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/LongRunningThreadLogger.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/LongRunningThreadLogger.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.generic.server;
 
 import java.lang.reflect.Method;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/MaintenanceTaskStarter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/MaintenanceTaskStarter.java
index 0dafd5f0af3..04b00308660 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/MaintenanceTaskStarter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/MaintenanceTaskStarter.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.generic.server;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.operation.config.IOperationExecutionConfig;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/MaterialGroupingDAG.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/MaterialGroupingDAG.java
index e899c02c4f1..9546b6c55f5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/MaterialGroupingDAG.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/MaterialGroupingDAG.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.generic.server;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/MaterialHelper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/MaterialHelper.java
index 083fe069c88..aba991202f2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/MaterialHelper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/MaterialHelper.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.generic.server;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/MetaprojectAssignmentsHelper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/MetaprojectAssignmentsHelper.java
index e0868a4e10a..2f6e103ba5d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/MetaprojectAssignmentsHelper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/MetaprojectAssignmentsHelper.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.generic.server;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/NameServerServlet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/NameServerServlet.java
index 3dfc7cbc188..071e5675726 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/NameServerServlet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/NameServerServlet.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.generic.server;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/NewExternalDataDAG.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/NewExternalDataDAG.java
index 03fa4afe156..bfab0b50303 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/NewExternalDataDAG.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/NewExternalDataDAG.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.generic.server;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/OpenBisSessionManager.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/OpenBisSessionManager.java
index 6dfc59789e2..1f7bb137f66 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/OpenBisSessionManager.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/OpenBisSessionManager.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.generic.server;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/OpenbisCrossOriginFilter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/OpenbisCrossOriginFilter.java
index 74e2d3394bb..8ab111b4cba 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/OpenbisCrossOriginFilter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/OpenbisCrossOriginFilter.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.generic.server;
 
 import java.net.MalformedURLException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/OptimisticLockingRetryAdvisor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/OptimisticLockingRetryAdvisor.java
index 1cbb8f533de..7d4921b7b4e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/OptimisticLockingRetryAdvisor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/OptimisticLockingRetryAdvisor.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.generic.server;
 
 import org.aopalliance.intercept.MethodInterceptor;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/SampleGroupingDAG.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/SampleGroupingDAG.java
index 32278b4a6a4..941b7a878c3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/SampleGroupingDAG.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/SampleGroupingDAG.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.generic.server;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/SearchHelper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/SearchHelper.java
index cdf30b5ed46..e320dba25de 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/SearchHelper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/SearchHelper.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.generic.server;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ServerExceptionTranslatingAdvisor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ServerExceptionTranslatingAdvisor.java
index 00cf4d7554f..f34343c4c6f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ServerExceptionTranslatingAdvisor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ServerExceptionTranslatingAdvisor.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.generic.server;
 
 import org.aopalliance.intercept.MethodInterceptor;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationClientManager.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationClientManager.java
index 2337a1befa1..a0860a68f40 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationClientManager.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/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.generic.server;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationClientManagerServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationClientManagerServer.java
index 5dde4060392..ede865bc2f7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationClientManagerServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationClientManagerServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.generic.server;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationServerManager.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationServerManager.java
index 1b2648007fe..fcf5106ac71 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationServerManager.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/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.generic.server;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationServerManagerServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationServerManagerServer.java
index 673ba633846..de5782a1642 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationServerManagerServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceConversationServerManagerServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.generic.server;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServer.java
index c7123e47105..59750244076 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServer.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.generic.server;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServerLogger.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServerLogger.java
index 77266c7531f..4aca035f4ab 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServerLogger.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServerLogger.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.generic.server;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/SessionFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/SessionFactory.java
index 957b246a9cd..9455571422a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/SessionFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/SessionFactory.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.generic.server;
 
 import java.util.concurrent.BlockingQueue;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/TrackingServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/TrackingServer.java
index 52e1e8d6f19..7bd5514abff 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/TrackingServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/TrackingServer.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.generic.server;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/TrackingServerLogger.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/TrackingServerLogger.java
index 999259c5f83..6838bcf43ec 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/TrackingServerLogger.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/TrackingServerLogger.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.generic.server;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/TrackingServiceServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/TrackingServiceServer.java
index f54dd4874cd..1184f27d6d2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/TrackingServiceServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/TrackingServiceServer.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.generic.server;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/TrustedCrossOriginDomainsProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/TrustedCrossOriginDomainsProvider.java
index ba08f173212..5a1b959c903 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/TrustedCrossOriginDomainsProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/TrustedCrossOriginDomainsProvider.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.generic.server;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/WhiteListBasedRemoteHostValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/WhiteListBasedRemoteHostValidator.java
index cd9c18e04ba..498133c3d31 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/WhiteListBasedRemoteHostValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/WhiteListBasedRemoteHostValidator.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.generic.server;
 
 import java.util.HashSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/ExperimentToDataSetRelatedEntitiesTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/ExperimentToDataSetRelatedEntitiesTranslator.java
index 00034fae63a..de9b1622dc8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/ExperimentToDataSetRelatedEntitiesTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/ExperimentToDataSetRelatedEntitiesTranslator.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.generic.server.api.v1;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingService.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingService.java
index ff47160fe2e..9f42038e418 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingService.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingService.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.generic.server.api.v1;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceJsonServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceJsonServer.java
index 14800f19a87..5b3237befb3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceJsonServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceJsonServer.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.openbis.generic.server.api.v1;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceLogger.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceLogger.java
index 3f09313432b..54eb2a275cf 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceLogger.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceLogger.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.generic.server.api.v1;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceServer.java
index 9357fe9dc2b..a38cc389ff6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceServer.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.openbis.generic.server.api.v1;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationService.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationService.java
index 49ac550a394..49b8612e927 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationService.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationService.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.generic.server.api.v1;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceJsonServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceJsonServer.java
index d3fa4391796..9bf36b82eee 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceJsonServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceJsonServer.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.openbis.generic.server.api.v1;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceLogger.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceLogger.java
index f8997887b7e..90dcef59112 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceLogger.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceLogger.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.generic.server.api.v1;
 
 import java.util.EnumSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceServer.java
index 6afab5e88bf..44b81d7e7a2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceServer.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.openbis.generic.server.api.v1;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/ResourceNames.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/ResourceNames.java
index 04cfbdadffa..20b8d5b7a70 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/ResourceNames.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/ResourceNames.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.generic.server.api.v1;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/SampleToDataSetRelatedEntitiesTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/SampleToDataSetRelatedEntitiesTranslator.java
index 382e8ac8b8b..682c09ff791 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/SampleToDataSetRelatedEntitiesTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/SampleToDataSetRelatedEntitiesTranslator.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.generic.server.api.v1;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/SearchCriteriaToDetailedSearchCriteriaTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/SearchCriteriaToDetailedSearchCriteriaTranslator.java
index aabd4c71e74..de8dc7fdda2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/SearchCriteriaToDetailedSearchCriteriaTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/SearchCriteriaToDetailedSearchCriteriaTranslator.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.generic.server.api.v1;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/WebInformationService.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/WebInformationService.java
index f30a7ea2a73..840853e1993 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/WebInformationService.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/WebInformationService.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.generic.server.api.v1;
 
 import javax.annotation.Resource;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/WebInformationServiceJsonServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/WebInformationServiceJsonServer.java
index e2f5dff6987..ffeee858c13 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/WebInformationServiceJsonServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/WebInformationServiceJsonServer.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.openbis.generic.server.api.v1;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/WebInformationServiceResourceNames.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/WebInformationServiceResourceNames.java
index e84299dc52a..1782d027c0e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/WebInformationServiceResourceNames.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/WebInformationServiceResourceNames.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.generic.server.api.v1;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/sort/SampleSearchResultSorter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/sort/SampleSearchResultSorter.java
index 7d40f77355f..6495e1ad986 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/sort/SampleSearchResultSorter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/sort/SampleSearchResultSorter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 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.
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/ActiveAuthorization.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/ActiveAuthorization.java
index e326c588bee..971aecbebcc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/ActiveAuthorization.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/ActiveAuthorization.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.generic.server.authorization;
 
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.IAuthorizationDAOFactory;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AlwaysStatusOkAccessController.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AlwaysStatusOkAccessController.java
index 3fff7cf228e..41bf30a9dea 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AlwaysStatusOkAccessController.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AlwaysStatusOkAccessController.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.generic.server.authorization;
 
 import java.lang.reflect.Method;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/Argument.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/Argument.java
index 58f94cb4e45..fdb66740f36 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/Argument.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/Argument.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2008 - 2023 Zürich, Scientific 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.generic.server.authorization;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationAdvisor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationAdvisor.java
index be55b007db9..b1129dad362 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationAdvisor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationAdvisor.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.generic.server.authorization;
 
 import java.lang.reflect.Method;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationDataProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationDataProvider.java
index 6a3e4d0979f..ce1d8ae578d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationDataProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationDataProvider.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.generic.server.authorization;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationServiceUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationServiceUtils.java
index 22d06ed3faa..60542abd354 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationServiceUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationServiceUtils.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.generic.server.authorization;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/CapabilityMap.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/CapabilityMap.java
index 1b31ae53982..6f9528dad68 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/CapabilityMap.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/CapabilityMap.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.generic.server.authorization;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultAccessController.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultAccessController.java
index e9eeebfb5b6..f0fd6c95e3c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultAccessController.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultAccessController.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.generic.server.authorization;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultReturnValueFilter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultReturnValueFilter.java
index 84ab603314f..6c3e12fc056 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultReturnValueFilter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultReturnValueFilter.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.generic.server.authorization;
 
 import java.lang.reflect.Array;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/IAccessController.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/IAccessController.java
index 8357bb153cb..c6a2d55017e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/IAccessController.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/IAccessController.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.generic.server.authorization;
 
 import java.lang.reflect.Method;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/IAuthorizationComponentFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/IAuthorizationComponentFactory.java
index d9d440906d5..0dc684d0f08 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/IAuthorizationComponentFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/IAuthorizationComponentFactory.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.generic.server.authorization;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/IAuthorizationDataProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/IAuthorizationDataProvider.java
index adc645b7ce2..d1a410b82f7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/IAuthorizationDataProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/IAuthorizationDataProvider.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.generic.server.authorization;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/IPredicateFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/IPredicateFactory.java
index 7b3b0cb7b40..2a2acc3a880 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/IPredicateFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/IPredicateFactory.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.generic.server.authorization;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.predicate.IPredicate;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/IReturnValueFilter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/IReturnValueFilter.java
index 2d32763c39a..fe296d72953 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/IReturnValueFilter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/IReturnValueFilter.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.generic.server.authorization;
 
 import java.lang.reflect.Method;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/NoAuthorization.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/NoAuthorization.java
index 4d1c40286ce..5883e97377c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/NoAuthorization.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/NoAuthorization.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.generic.server.authorization;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/NoReturnValueFilter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/NoReturnValueFilter.java
index d7eeb2b4f06..a45f4eb0b5b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/NoReturnValueFilter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/NoReturnValueFilter.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.generic.server.authorization;
 
 import java.lang.reflect.Method;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/PredicateExecutor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/PredicateExecutor.java
index d9ed9d47815..f48c7b511aa 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/PredicateExecutor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/PredicateExecutor.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.generic.server.authorization;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/PredicateFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/PredicateFactory.java
index 9ddb1b6c506..7d1ee85d495 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/PredicateFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/PredicateFactory.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.generic.server.authorization;
 
 import ch.systemsx.cisd.common.reflection.ClassUtils;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/RoleWithIdentifier.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/RoleWithIdentifier.java
index 706be1d221a..c9c7a2264e2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/RoleWithIdentifier.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/RoleWithIdentifier.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.generic.server.authorization;
 
 import ch.rinn.restrictions.Private;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/SpaceOwnerKind.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/SpaceOwnerKind.java
index 91f100d3aa5..b30c2f6f6eb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/SpaceOwnerKind.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/SpaceOwnerKind.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.generic.server.authorization;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/ValidatorStore.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/ValidatorStore.java
index 77dfb3d16c3..f3b8ed17d7e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/ValidatorStore.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/ValidatorStore.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.generic.server.authorization;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/annotation/AuthorizationGuard.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/annotation/AuthorizationGuard.java
index ee80ff3a663..a7aa86eba99 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/annotation/AuthorizationGuard.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/annotation/AuthorizationGuard.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.generic.server.authorization.annotation;
 
 import java.lang.annotation.ElementType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/annotation/Capability.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/annotation/Capability.java
index 846dccc23e1..a2fecede030 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/annotation/Capability.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/annotation/Capability.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.generic.server.authorization.annotation;
 
 import java.lang.annotation.ElementType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/annotation/ReturnValueFilter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/annotation/ReturnValueFilter.java
index d4317378872..2439864dded 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/annotation/ReturnValueFilter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/annotation/ReturnValueFilter.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.generic.server.authorization.annotation;
 
 import java.lang.annotation.ElementType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/annotation/RolesAllowed.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/annotation/RolesAllowed.java
index 788bfc0dab5..635440af6f4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/annotation/RolesAllowed.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/annotation/RolesAllowed.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.openbis.generic.server.authorization.annotation;
 
 import java.lang.annotation.ElementType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/annotation/ShouldFlattenCollections.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/annotation/ShouldFlattenCollections.java
index 6d8cbc65dcb..d6301064975 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/annotation/ShouldFlattenCollections.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/annotation/ShouldFlattenCollections.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.generic.server.authorization.annotation;
 
 import java.lang.annotation.ElementType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractDatabaseInstancePredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractDatabaseInstancePredicate.java
index 816709c36a6..529f64d4175 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractDatabaseInstancePredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractDatabaseInstancePredicate.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.generic.server.authorization.predicate;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractExperimentPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractExperimentPredicate.java
index a0c4a15edec..c1c536566f7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractExperimentPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractExperimentPredicate.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.generic.server.authorization.predicate;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractExpressionPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractExpressionPredicate.java
index cb7ce427163..2930d68bdce 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractExpressionPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractExpressionPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractPredicate.java
index d177444f587..003d980ffc4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractProjectPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractProjectPredicate.java
index bc657359f4a..7c640e2b602 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractProjectPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractProjectPredicate.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.generic.server.authorization.predicate;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractSamplePredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractSamplePredicate.java
index c14726d8019..1e17447ffcd 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractSamplePredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractSamplePredicate.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.generic.server.authorization.predicate;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractSpacePredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractSpacePredicate.java
index 4326d16d856..e48ed79a4a7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractSpacePredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractSpacePredicate.java
@@ -1,6 +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.
@@ -14,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractTechIdCollectionPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractTechIdCollectionPredicate.java
index 0102e02f16e..5b96690048a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractTechIdCollectionPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractTechIdCollectionPredicate.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.generic.server.authorization.predicate;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractTechIdPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractTechIdPredicate.java
index f82c85af890..986330529d3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractTechIdPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractTechIdPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ArrayPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ArrayPredicate.java
index e4542f95e03..8931ec8cdb1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ArrayPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ArrayPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AtomicOperationsPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AtomicOperationsPredicate.java
index 79001e7a408..6d7ca9269e3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AtomicOperationsPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AtomicOperationsPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/BasicEntityDescriptionPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/BasicEntityDescriptionPredicate.java
index 79ad6e9d154..f514a3d635b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/BasicEntityDescriptionPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/BasicEntityDescriptionPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/CollectionPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/CollectionPredicate.java
index 4a5eb9e0e85..56f60f4e1be 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/CollectionPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/CollectionPredicate.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.generic.server.authorization.predicate;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataPEPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataPEPredicate.java
index a28b5798501..40c11b574db 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataPEPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataPEPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetAccessPECollectionPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetAccessPECollectionPredicate.java
index e664e85a7f7..e63ccf2e0cc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetAccessPECollectionPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetAccessPECollectionPredicate.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.generic.server.authorization.predicate;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.ShouldFlattenCollections;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetAccessPEPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetAccessPEPredicate.java
index 86cb2678da1..c18431a0e61 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetAccessPEPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetAccessPEPredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetCodeCollectionPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetCodeCollectionPredicate.java
index cc6f4e0f62b..a3e93a8a2e6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetCodeCollectionPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetCodeCollectionPredicate.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.generic.server.authorization.predicate;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetCodePredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetCodePredicate.java
index d85d78abfb2..27a1afbf713 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetCodePredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetCodePredicate.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.generic.server.authorization.predicate;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetTechIdCollectionPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetTechIdCollectionPredicate.java
index 41d4b0b1dba..0788e911cc3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetTechIdCollectionPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetTechIdCollectionPredicate.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.generic.server.authorization.predicate;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetTechIdPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetTechIdPredicate.java
index a2570f95abf..ae8f45b794a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetTechIdPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetTechIdPredicate.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.generic.server.authorization.predicate;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetUpdatesCollectionPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetUpdatesCollectionPredicate.java
index 8e1de38ee0d..aa2b01757b4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetUpdatesCollectionPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetUpdatesCollectionPredicate.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.generic.server.authorization.predicate;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetUpdatesPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetUpdatesPredicate.java
index bd468a44ea0..b6ea4025c40 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetUpdatesPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetUpdatesPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DatabaseInstanceIdentifierPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DatabaseInstanceIdentifierPredicate.java
index e358ec26efd..8fa5ffa6d41 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DatabaseInstanceIdentifierPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DatabaseInstanceIdentifierPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DelegatedNullableAbstractPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DelegatedNullableAbstractPredicate.java
index e9b417336d7..669dfe613d9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DelegatedNullableAbstractPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DelegatedNullableAbstractPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DelegatedPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DelegatedPredicate.java
index c79f394ff2d..abc936ad592 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DelegatedPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DelegatedPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DeletionTechIdCollectionPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DeletionTechIdCollectionPredicate.java
index 12c2ba04706..c38e4c56023 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DeletionTechIdCollectionPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DeletionTechIdCollectionPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExistingSampleIdentifierPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExistingSampleIdentifierPredicate.java
index e27f23ae29d..1f286b6f4b5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExistingSampleIdentifierPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExistingSampleIdentifierPredicate.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.generic.server.authorization.predicate;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExistingSpaceIdentifierOrProjectPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExistingSpaceIdentifierOrProjectPredicate.java
index 55b4e682e9c..73c7e8182cb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExistingSpaceIdentifierOrProjectPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExistingSpaceIdentifierOrProjectPredicate.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.generic.server.authorization.predicate;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExistingSpaceIdentifierPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExistingSpaceIdentifierPredicate.java
index f65d7158210..98f3a477dc4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExistingSpaceIdentifierPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExistingSpaceIdentifierPredicate.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.generic.server.authorization.predicate;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentAccessPECollectionPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentAccessPECollectionPredicate.java
index a20fbfd2d11..fcc643c2fab 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentAccessPECollectionPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentAccessPECollectionPredicate.java
@@ -1,6 +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.
@@ -14,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.generic.server.authorization.predicate;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.ShouldFlattenCollections;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentAccessPEPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentAccessPEPredicate.java
index 2e93e6af0ec..0e5598290e0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentAccessPEPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentAccessPEPredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentAugmentedCodePredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentAugmentedCodePredicate.java
index 54a8761a3a2..e14583d8c8b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentAugmentedCodePredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentAugmentedCodePredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentIdPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentIdPredicate.java
index 361bd5f8dd3..bb3b07c8232 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentIdPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentIdPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentListPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentListPredicate.java
index e767c62cffd..c89dbcc05a7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentListPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentListPredicate.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.generic.server.authorization.predicate;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentPEOrNullPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentPEOrNullPredicate.java
index ea5a22236e8..76f95381990 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentPEOrNullPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentPEOrNullPredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.generic.server.authorization.predicate;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentPEPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentPEPredicate.java
index 51dd407f6f2..4d21af57425 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentPEPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentPEPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentPermIdPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentPermIdPredicate.java
index 045b502a604..6975b14fadf 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentPermIdPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentPermIdPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentUpdatesPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentUpdatesPredicate.java
index d2f8d86d973..5ba5d483302 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentUpdatesPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentUpdatesPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/IPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/IPredicate.java
index af22024b16a..323ad330993 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/IPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/IPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ListSampleCriteriaPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ListSampleCriteriaPredicate.java
index 0d8e7641225..c6ea25cfa4c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ListSampleCriteriaPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ListSampleCriteriaPredicate.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.generic.server.authorization.predicate;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ListSamplesByPropertyPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ListSamplesByPropertyPredicate.java
index 1a2f82a2722..1f6309dff17 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ListSamplesByPropertyPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ListSamplesByPropertyPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/MetaprojectIdPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/MetaprojectIdPredicate.java
index 44685c07c92..a40c0d463f3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/MetaprojectIdPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/MetaprojectIdPredicate.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.generic.server.authorization.predicate;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/MetaprojectPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/MetaprojectPredicate.java
index 1ebf4590210..e9760b4b1fc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/MetaprojectPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/MetaprojectPredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.generic.server.authorization.predicate;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/MetaprojectTechIdPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/MetaprojectTechIdPredicate.java
index e768798c496..cb82773e13a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/MetaprojectTechIdPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/MetaprojectTechIdPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewDataSetsWithTypePredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewDataSetsWithTypePredicate.java
index 2359c7b6595..877e487daac 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewDataSetsWithTypePredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewDataSetsWithTypePredicate.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.generic.server.authorization.predicate;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewExperimentPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewExperimentPredicate.java
index 3dbf1a841b5..9d8f273e1dd 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewExperimentPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewExperimentPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewExperimentsWithTypePredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewExperimentsWithTypePredicate.java
index 22ee08e0fdc..50e6e9eaa98 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewExperimentsWithTypePredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewExperimentsWithTypePredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewExternalDataPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewExternalDataPredicate.java
index 2d60b6cbaf3..e0686ad724f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewExternalDataPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewExternalDataPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewProjectPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewProjectPredicate.java
index c347cca1eb3..2f5191ae02e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewProjectPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewProjectPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewSampleCollectionPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewSampleCollectionPredicate.java
index c6158495431..1f796f914eb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewSampleCollectionPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewSampleCollectionPredicate.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.generic.server.authorization.predicate;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewSample;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewSampleIdentifierPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewSampleIdentifierPredicate.java
index ee782ecb2b2..e492c6dc83a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewSampleIdentifierPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewSampleIdentifierPredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewSamplePredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewSamplePredicate.java
index 01f65db4f20..b1ac2f5e25b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewSamplePredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewSamplePredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewSamplesWithTypePredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewSamplesWithTypePredicate.java
index aa48d5abdfa..f2a24dba86a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewSamplesWithTypePredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewSamplesWithTypePredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NullableGroupIdentifierPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NullableGroupIdentifierPredicate.java
index ff4de6715c5..3e92c6e6af8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NullableGroupIdentifierPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NullableGroupIdentifierPredicate.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.generic.server.authorization.predicate;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/PersistentEntityPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/PersistentEntityPredicate.java
index 5a289dfee87..ac2c2c46792 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/PersistentEntityPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/PersistentEntityPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectAugmentedCodePredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectAugmentedCodePredicate.java
index b48ab05b9c2..45798a45a15 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectAugmentedCodePredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectAugmentedCodePredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectIdPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectIdPredicate.java
index 25d1fb1d3ec..da4f5133883 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectIdPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectIdPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectIdentifierExistingSpacePredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectIdentifierExistingSpacePredicate.java
index c5b6b1f48da..45e0884b56d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectIdentifierExistingSpacePredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectIdentifierExistingSpacePredicate.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.generic.server.authorization.predicate;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectIdentifierPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectIdentifierPredicate.java
index ea8a7085800..a044e5fbc21 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectIdentifierPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectIdentifierPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectPEPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectPEPredicate.java
index 95c1f67a700..4ae9196102b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectPEPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectPEPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectPermIdPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectPermIdPredicate.java
index eb85e2d8674..aef6e59b220 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectPermIdPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectPermIdPredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectPermIdStringPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectPermIdStringPredicate.java
index a9edfe57fe9..43f752e5398 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectPermIdStringPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectPermIdStringPredicate.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.generic.server.authorization.predicate;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.PermId;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectPredicate.java
index d785b572b00..5521e857064 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectUpdatesPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectUpdatesPredicate.java
index 09f25be4d8c..9827d9b85b9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectUpdatesPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectUpdatesPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/RevertDeletionPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/RevertDeletionPredicate.java
index c80e4f2bb16..63fd507e4d2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/RevertDeletionPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/RevertDeletionPredicate.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.generic.server.authorization.predicate;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleAccessPECollectionPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleAccessPECollectionPredicate.java
index 5ee9812d91d..7c61bc5caf6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleAccessPECollectionPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleAccessPECollectionPredicate.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.generic.server.authorization.predicate;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.ShouldFlattenCollections;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleAccessPEPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleAccessPEPredicate.java
index 85f6d7e795a..7d1991c3747 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleAccessPEPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleAccessPEPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleAugmentedCodePredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleAugmentedCodePredicate.java
index 4fe4e36cce1..2895f252b32 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleAugmentedCodePredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleAugmentedCodePredicate.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.generic.server.authorization.predicate;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleAugmentedCodeReadWritePredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleAugmentedCodeReadWritePredicate.java
index cadf55e55a0..8938947e0c4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleAugmentedCodeReadWritePredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleAugmentedCodeReadWritePredicate.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.generic.server.authorization.predicate;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleIdPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleIdPredicate.java
index 96c1b452cd1..bef594bc98c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleIdPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleIdPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleIdentifierCollectionPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleIdentifierCollectionPredicate.java
index 72f1fdc48ed..fcb85dcbbf5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleIdentifierCollectionPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleIdentifierCollectionPredicate.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.generic.server.authorization.predicate;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.ShouldFlattenCollections;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleIdentifierPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleIdentifierPredicate.java
index 09c3a764e52..c17088f96a8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleIdentifierPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleIdentifierPredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleListPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleListPredicate.java
index 62a67fa1a9d..b1019851cdf 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleListPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleListPredicate.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.generic.server.authorization.predicate;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleOwnerIdentifierCollectionPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleOwnerIdentifierCollectionPredicate.java
index 08df2f0a451..adb98e0314a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleOwnerIdentifierCollectionPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleOwnerIdentifierCollectionPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePEOrNullPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePEOrNullPredicate.java
index ff221537452..95ee5ecb861 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePEOrNullPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePEOrNullPredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.generic.server.authorization.predicate;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePEPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePEPredicate.java
index 0574afb057d..98d86df2ef6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePEPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePEPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePermIdNullAllowedPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePermIdNullAllowedPredicate.java
index 3a79add6b45..8812590723a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePermIdNullAllowedPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePermIdNullAllowedPredicate.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.systemsx.cisd.openbis.generic.server.authorization.predicate;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePermIdPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePermIdPredicate.java
index ee9b3823c89..88073658bfb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePermIdPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePermIdPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePermIdStringPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePermIdStringPredicate.java
index 732c0ee5e75..555ddd8a4b5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePermIdStringPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePermIdStringPredicate.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.generic.server.authorization.predicate;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.PermId;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePredicate.java
index 222bbaf2b58..ef5b44c9c01 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePredicate.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.generic.server.authorization.predicate;
 
 import java.util.Collections;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleTechIdCollectionPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleTechIdCollectionPredicate.java
index 99c289ce354..2f28cc7b368 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleTechIdCollectionPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleTechIdCollectionPredicate.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.generic.server.authorization.predicate;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleTechIdCollectionReadWritePredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleTechIdCollectionReadWritePredicate.java
index a820272422b..9e55c772a87 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleTechIdCollectionReadWritePredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleTechIdCollectionReadWritePredicate.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.generic.server.authorization.predicate;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.ShouldFlattenCollections;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleTechIdPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleTechIdPredicate.java
index ec9e81bfe01..88986d8ca86 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleTechIdPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleTechIdPredicate.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.generic.server.authorization.predicate;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleTechIdReadWritePredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleTechIdReadWritePredicate.java
index bd3ead47014..a673d959ea0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleTechIdReadWritePredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleTechIdReadWritePredicate.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.generic.server.authorization.predicate;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleUpdatesCollectionPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleUpdatesCollectionPredicate.java
index c121aaaf3f1..27f0739b52f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleUpdatesCollectionPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleUpdatesCollectionPredicate.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.generic.server.authorization.predicate;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleUpdatesPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleUpdatesPredicate.java
index 35b05ba3e48..c601134385d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleUpdatesPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleUpdatesPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SpaceIdentifierPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SpaceIdentifierPredicate.java
index 5ffd04d3395..2207ee35fcd 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SpaceIdentifierPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SpaceIdentifierPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SpaceOrProjectPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SpaceOrProjectPredicate.java
index 46fcbb3ba62..7e3fc6fd92f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SpaceOrProjectPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SpaceOrProjectPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SpacePEPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SpacePEPredicate.java
index 196e02959fc..7c6308acc78 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SpacePEPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SpacePEPredicate.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.generic.server.authorization.predicate;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.SpacePE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SpaceUpdatesPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SpaceUpdatesPredicate.java
index 1c06d5fe594..9c27b6e53fa 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SpaceUpdatesPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SpaceUpdatesPredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 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.generic.server.authorization.predicate;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.predicate.AbstractTechIdPredicate.SpaceTechIdPredicate;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/UpdatedExperimentsWithTypePredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/UpdatedExperimentsWithTypePredicate.java
index b46ab015f0c..580a8816675 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/UpdatedExperimentsWithTypePredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/UpdatedExperimentsWithTypePredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/V3DeletionIdPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/V3DeletionIdPredicate.java
index 47b4f20a7f8..6d55ff0d4c9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/V3DeletionIdPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/V3DeletionIdPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/V3RevertDeletionPredicate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/V3RevertDeletionPredicate.java
index bb6ed14ca56..eae2c12733d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/V3RevertDeletionPredicate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/V3RevertDeletionPredicate.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/v3tov1/DeletionIdTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/v3tov1/DeletionIdTranslator.java
index 37bcf7fe821..7e49b59883d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/v3tov1/DeletionIdTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/v3tov1/DeletionIdTranslator.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.generic.server.authorization.predicate.v3tov1;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/IProjectAuthorization.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/IProjectAuthorization.java
index 32003bf05e9..d330117b2c0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/IProjectAuthorization.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/IProjectAuthorization.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.generic.server.authorization.project;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/ProjectAuthorizationBuilder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/ProjectAuthorizationBuilder.java
index f0697aae0d1..c5b07d5a3a5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/ProjectAuthorizationBuilder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/ProjectAuthorizationBuilder.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.generic.server.authorization.project;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/ProjectAuthorizationDisabled.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/ProjectAuthorizationDisabled.java
index cd3c8ff5212..212a57cca87 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/ProjectAuthorizationDisabled.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/ProjectAuthorizationDisabled.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.generic.server.authorization.project;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/ProjectAuthorizationEnabled.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/ProjectAuthorizationEnabled.java
index af50e7d9ceb..ad1bee510e7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/ProjectAuthorizationEnabled.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/ProjectAuthorizationEnabled.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.generic.server.authorization.project;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/object/IObject.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/object/IObject.java
index 32fbea2f68b..1282280015c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/object/IObject.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/object/IObject.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.generic.server.authorization.project.data.object;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.project.data.project.IProject;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/object/Object.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/object/Object.java
index 5473a6382bb..e200157d01b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/object/Object.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/object/Object.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.generic.server.authorization.project.data.object;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.project.data.project.IProject;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/project/IProject.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/project/IProject.java
index 914a1c03291..11f63b7a296 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/project/IProject.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/project/IProject.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.generic.server.authorization.project.data.project;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/project/ProjectFromIIdentifierHolder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/project/ProjectFromIIdentifierHolder.java
index a1c43370a81..03f54aee973 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/project/ProjectFromIIdentifierHolder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/project/ProjectFromIIdentifierHolder.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.generic.server.authorization.project.data.project;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.IIdentifierHolder;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/project/ProjectFromIdentifier.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/project/ProjectFromIdentifier.java
index 0d60e36842e..672fa684ef2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/project/ProjectFromIdentifier.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/project/ProjectFromIdentifier.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.generic.server.authorization.project.data.project;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/project/ProjectFromProject.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/project/ProjectFromProject.java
index 437e7ff85e4..b18336185da 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/project/ProjectFromProject.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/project/ProjectFromProject.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.generic.server.authorization.project.data.project;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Project;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/project/ProjectFromProjectPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/project/ProjectFromProjectPE.java
index c42e9c57598..a325fa6f89c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/project/ProjectFromProjectPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/project/ProjectFromProjectPE.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.generic.server.authorization.project.data.project;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.ProjectPE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/project/ProjectFromProjectV1.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/project/ProjectFromProjectV1.java
index 6cb95828773..83e6f688e4e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/project/ProjectFromProjectV1.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/project/ProjectFromProjectV1.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.generic.server.authorization.project.data.project;
 
 import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.Project;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/role/IRole.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/role/IRole.java
index 7f6c5df37e4..93c3c2f8e7b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/role/IRole.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/role/IRole.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.generic.server.authorization.project.data.role;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.project.data.project.IProject;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/role/RoleFromRoleAssignmentPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/role/RoleFromRoleAssignmentPE.java
index fdf4017a1b5..310c47812c5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/role/RoleFromRoleAssignmentPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/role/RoleFromRoleAssignmentPE.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.generic.server.authorization.project.data.role;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.project.data.project.IProject;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/role/RoleFromRoleWithIdentifier.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/role/RoleFromRoleWithIdentifier.java
index 15795828b8c..8dc48766496 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/role/RoleFromRoleWithIdentifier.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/data/role/RoleFromRoleWithIdentifier.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.generic.server.authorization.project.data.role;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.RoleWithIdentifier;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/object/IObjectsProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/object/IObjectsProvider.java
index 433fa372425..f4d98d02645 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/object/IObjectsProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/object/IObjectsProvider.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.generic.server.authorization.project.provider.object;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/object/SingleObjectProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/object/SingleObjectProvider.java
index a61a1c9590a..52b54a33f5a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/object/SingleObjectProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/object/SingleObjectProvider.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.generic.server.authorization.project.provider.object;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromExperimentIIdentifierHolder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromExperimentIIdentifierHolder.java
index 2fa9766f2f5..ed15f2191c3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromExperimentIIdentifierHolder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromExperimentIIdentifierHolder.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.generic.server.authorization.project.provider.project;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromExperimentIdentifierString.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromExperimentIdentifierString.java
index ff6fe5d8bc2..de4c853c1fc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromExperimentIdentifierString.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromExperimentIdentifierString.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.generic.server.authorization.project.provider.project;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromExperimentPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromExperimentPE.java
index 36701652d06..2af4144ee92 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromExperimentPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromExperimentPE.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.generic.server.authorization.project.provider.project;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromExperimentPermId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromExperimentPermId.java
index 210b0b86d54..029fcc019ca 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromExperimentPermId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromExperimentPermId.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.generic.server.authorization.project.provider.project;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromExperimentTechId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromExperimentTechId.java
index 9cfc5ecacbc..273ec50062f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromExperimentTechId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromExperimentTechId.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.generic.server.authorization.project.provider.project;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromNewExperiment.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromNewExperiment.java
index 30a743db392..631d3e194ff 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromNewExperiment.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromNewExperiment.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.generic.server.authorization.project.provider.project;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromNewProject.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromNewProject.java
index 881bd334777..cb946451339 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromNewProject.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromNewProject.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.generic.server.authorization.project.provider.project;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromProject.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromProject.java
index 60c2efe64fd..5025bf8f9f2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromProject.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromProject.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.generic.server.authorization.project.provider.project;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromProjectIIdentifierHolder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromProjectIIdentifierHolder.java
index 5b04b7bfb09..6a6fdd66fe5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromProjectIIdentifierHolder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromProjectIIdentifierHolder.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.generic.server.authorization.project.provider.project;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromProjectIdentifierObject.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromProjectIdentifierObject.java
index 55b748c878f..bc81a5c7542 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromProjectIdentifierObject.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromProjectIdentifierObject.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.generic.server.authorization.project.provider.project;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromProjectIdentifierString.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromProjectIdentifierString.java
index 6bb10a16e6d..251cb233b72 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromProjectIdentifierString.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromProjectIdentifierString.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.generic.server.authorization.project.provider.project;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromProjectPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromProjectPE.java
index 4cc170041b1..1439beda066 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromProjectPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromProjectPE.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.generic.server.authorization.project.provider.project;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromProjectTechId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromProjectTechId.java
index d3a5611f8f0..8e219ba9fd5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromProjectTechId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromProjectTechId.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.generic.server.authorization.project.provider.project;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromProjectV1.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromProjectV1.java
index f3e8630b427..71a9bf3d633 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromProjectV1.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromProjectV1.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.generic.server.authorization.project.provider.project;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromSample.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromSample.java
index 4db0c8d85c8..3431446b8ac 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromSample.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromSample.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.generic.server.authorization.project.provider.project;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromSampleIdentifierString.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromSampleIdentifierString.java
index d86b5cba720..331a02b4145 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromSampleIdentifierString.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromSampleIdentifierString.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.generic.server.authorization.project.provider.project;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromSpaceCodeAndSampleCode.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromSpaceCodeAndSampleCode.java
index 887a7df44b9..e0407fa673e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromSpaceCodeAndSampleCode.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectProviderFromSpaceCodeAndSampleCode.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.generic.server.authorization.project.provider.project;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectsProviderFromExperimentTechIdCollection.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectsProviderFromExperimentTechIdCollection.java
index 741a36ea8a7..7436b17ed46 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectsProviderFromExperimentTechIdCollection.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectsProviderFromExperimentTechIdCollection.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.generic.server.authorization.project.provider.project;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectsProviderFromExperimentV1Collection.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectsProviderFromExperimentV1Collection.java
index adc940f7cd9..a89f742e60b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectsProviderFromExperimentV1Collection.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectsProviderFromExperimentV1Collection.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.generic.server.authorization.project.provider.project;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectsProviderFromProjectTechIdCollection.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectsProviderFromProjectTechIdCollection.java
index 713620828ac..a26b2a50c42 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectsProviderFromProjectTechIdCollection.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectsProviderFromProjectTechIdCollection.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.generic.server.authorization.project.provider.project;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectsProviderFromSampleV1Collection.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectsProviderFromSampleV1Collection.java
index 54fd253fea4..7a1dd464a92 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectsProviderFromSampleV1Collection.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/project/ProjectsProviderFromSampleV1Collection.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.generic.server.authorization.project.provider.project;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/role/IRolesProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/role/IRolesProvider.java
index ed6450ab5a2..a20940e28c0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/role/IRolesProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/role/IRolesProvider.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.generic.server.authorization.project.provider.role;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/role/RolesProviderFromPersonPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/role/RolesProviderFromPersonPE.java
index 9d27078d6f3..c37d9f2a77a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/role/RolesProviderFromPersonPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/role/RolesProviderFromPersonPE.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.generic.server.authorization.project.provider.role;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/role/RolesProviderFromRolesWithIdentifier.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/role/RolesProviderFromRolesWithIdentifier.java
index cec76cb8ddd..d9a19605a59 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/role/RolesProviderFromRolesWithIdentifier.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/role/RolesProviderFromRolesWithIdentifier.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.generic.server.authorization.project.provider.role;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/user/IUserProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/user/IUserProvider.java
index 8647a3d9c84..e41737044bc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/user/IUserProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/user/IUserProvider.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.generic.server.authorization.project.provider.user;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/user/UserProviderFromPersonPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/user/UserProviderFromPersonPE.java
index 82b08d1f27f..57d87c0097f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/user/UserProviderFromPersonPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/provider/user/UserProviderFromPersonPE.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.generic.server.authorization.project.provider.user;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/AbstractCollectionValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/AbstractCollectionValidator.java
index ece3758d378..985a503f0ae 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/AbstractCollectionValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/AbstractCollectionValidator.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.generic.server.authorization.validator;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/AbstractDataSetByExperimentOrSampleIdentifierValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/AbstractDataSetByExperimentOrSampleIdentifierValidator.java
index 9b9b084ab41..6991ebf0f73 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/AbstractDataSetByExperimentOrSampleIdentifierValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/AbstractDataSetByExperimentOrSampleIdentifierValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 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.generic.server.authorization.validator;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/AbstractIdentifierValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/AbstractIdentifierValidator.java
index 137897cb7a8..49533904705 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/AbstractIdentifierValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/AbstractIdentifierValidator.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.generic.server.authorization.validator;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.ICodeHolder;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/AbstractValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/AbstractValidator.java
index e105256b6c3..8389d6f8e70 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/AbstractValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/AbstractValidator.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.generic.server.authorization.validator;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/DataSetByExperimentOrSampleIdentifierValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/DataSetByExperimentOrSampleIdentifierValidator.java
index 8a3f05fd8de..fca44ae5f82 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/DataSetByExperimentOrSampleIdentifierValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/DataSetByExperimentOrSampleIdentifierValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 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.generic.server.authorization.validator;
 
 import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.DataSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/DataSetPEByExperimentOrSampleIdentifierValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/DataSetPEByExperimentOrSampleIdentifierValidator.java
index c190219722d..d4457f09c2d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/DataSetPEByExperimentOrSampleIdentifierValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/DataSetPEByExperimentOrSampleIdentifierValidator.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.generic.server.authorization.validator;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.DataPE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/DeletionValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/DeletionValidator.java
index 6668ff5378f..f89ccd97a92 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/DeletionValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/DeletionValidator.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.generic.server.authorization.validator;
 
 import java.util.Collections;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/EntityHistoryValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/EntityHistoryValidator.java
index 311cad80205..128cf1ae514 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/EntityHistoryValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/EntityHistoryValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 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.generic.server.authorization.validator;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ExperimentByIdentiferValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ExperimentByIdentiferValidator.java
index 1c740dc9151..ba8d359dd6a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ExperimentByIdentiferValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ExperimentByIdentiferValidator.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.generic.server.authorization.validator;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.project.provider.project.ProjectProviderFromExperimentIIdentifierHolder;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ExperimentValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ExperimentValidator.java
index 10f5da8acac..f44ec969629 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ExperimentValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ExperimentValidator.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.generic.server.authorization.validator;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.project.provider.project.ProjectProviderFromProject;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ExpressionValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ExpressionValidator.java
index 432d966ca60..8483051c804 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ExpressionValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ExpressionValidator.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.generic.server.authorization.validator;
 
 import java.util.Set;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ExternalDataValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ExternalDataValidator.java
index fdc9781ee77..f33dd55a04d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ExternalDataValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ExternalDataValidator.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.generic.server.authorization.validator;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ICollectionValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ICollectionValidator.java
index 4cfc979884c..87d08deb1d7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ICollectionValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ICollectionValidator.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.generic.server.authorization.validator;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/IValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/IValidator.java
index 1929e02d3d6..f32979d0149 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/IValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/IValidator.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.generic.server.authorization.validator;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/MatchingEntityValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/MatchingEntityValidator.java
index 6b6ebe2ee2a..48b148c3b3b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/MatchingEntityValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/MatchingEntityValidator.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.generic.server.authorization.validator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ProjectByIdentiferValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ProjectByIdentiferValidator.java
index 1fa20f166a2..2190869d40f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ProjectByIdentiferValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ProjectByIdentiferValidator.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.generic.server.authorization.validator;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.project.provider.project.ProjectProviderFromProjectIIdentifierHolder;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ProjectValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ProjectValidator.java
index 1ca75371f23..dcb4ab05a41 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ProjectValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ProjectValidator.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.generic.server.authorization.validator;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.project.provider.project.ProjectProviderFromProject;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SampleByIdentiferValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SampleByIdentiferValidator.java
index e960d58ce36..a7c48208982 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SampleByIdentiferValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SampleByIdentiferValidator.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.generic.server.authorization.validator;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.project.provider.project.ProjectProviderFromSampleIdentifierString;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SamplePropertyAccessValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SamplePropertyAccessValidator.java
index 76807e71d2b..326586db16b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SamplePropertyAccessValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SamplePropertyAccessValidator.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.systemsx.cisd.openbis.generic.server.authorization.validator;
 
 import ch.systemsx.cisd.common.collection.IValidator;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SampleValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SampleValidator.java
index 9643cd76a06..c18ffbb9322 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SampleValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SampleValidator.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.generic.server.authorization.validator;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.project.provider.project.ProjectProviderFromSample;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SearchDomainSearchResultValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SearchDomainSearchResultValidator.java
index 0b1b8fc65ba..c6c75731f10 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SearchDomainSearchResultValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SearchDomainSearchResultValidator.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.generic.server.authorization.validator;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SimpleSpaceOrProjectValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SimpleSpaceOrProjectValidator.java
index 53f917ac9ee..e73520d29ed 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SimpleSpaceOrProjectValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SimpleSpaceOrProjectValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 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.generic.server.authorization.validator;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SimpleSpaceValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SimpleSpaceValidator.java
index 83b30d4a333..7338519158f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SimpleSpaceValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SimpleSpaceValidator.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.generic.server.authorization.validator;
 
 import java.util.Set;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SpaceValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SpaceValidator.java
index 9a6856fa2ba..3b760eadbef 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SpaceValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SpaceValidator.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.generic.server.authorization.validator;
 
 import java.util.Set;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/StorageConfirmedForAdminValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/StorageConfirmedForAdminValidator.java
index c6e1ff351e3..c216eb96408 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/StorageConfirmedForAdminValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/StorageConfirmedForAdminValidator.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.generic.server.authorization.validator;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy.RoleCode;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/AbstractBatchOperation.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/AbstractBatchOperation.java
index cdf02e8538a..08c661b764e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/AbstractBatchOperation.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/AbstractBatchOperation.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.generic.server.batch;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/AbstractBatchOperationDelegate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/AbstractBatchOperationDelegate.java
index f6c18553887..a03dc073ef6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/AbstractBatchOperationDelegate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/AbstractBatchOperationDelegate.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.generic.server.batch;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/BatchOperationExecutor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/BatchOperationExecutor.java
index 7bc393f25ea..def8a1764a5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/BatchOperationExecutor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/BatchOperationExecutor.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.generic.server.batch;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/DataSetBatchUpdate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/DataSetBatchUpdate.java
index 3e570de1cbd..bd136d46dad 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/DataSetBatchUpdate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/DataSetBatchUpdate.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.generic.server.batch;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/DataSetCheckBeforeBatchUpdate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/DataSetCheckBeforeBatchUpdate.java
index de7d37307ec..33b91d1e364 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/DataSetCheckBeforeBatchUpdate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/DataSetCheckBeforeBatchUpdate.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.generic.server.batch;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/IBatchOperation.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/IBatchOperation.java
index f3408d67425..af12a1db77f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/IBatchOperation.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/IBatchOperation.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.generic.server.batch;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/IBatchOperationDelegate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/IBatchOperationDelegate.java
index 6dfe0a8165c..f9655a6e509 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/IBatchOperationDelegate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/IBatchOperationDelegate.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.generic.server.batch;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/IProgressAware.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/IProgressAware.java
index 30e7a1a4ace..5b067fa1bc6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/IProgressAware.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/IProgressAware.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.generic.server.batch;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/SampleBatchRegistration.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/SampleBatchRegistration.java
index e1f73d83a3c..d06ec20277b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/SampleBatchRegistration.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/SampleBatchRegistration.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.generic.server.batch;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/SampleBatchUpdate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/SampleBatchUpdate.java
index 504e46ae5aa..f830e6e971a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/SampleBatchUpdate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/SampleBatchUpdate.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.generic.server.batch;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/SampleCheckBeforeUpdate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/SampleCheckBeforeUpdate.java
index 47e9b7154f1..a68264036bd 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/SampleCheckBeforeUpdate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/SampleCheckBeforeUpdate.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.generic.server.batch;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/SampleUpdate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/SampleUpdate.java
index a17a9b15bc7..27a44f8072b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/SampleUpdate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/batch/SampleUpdate.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.generic.server.batch;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/DataStoreServiceFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/DataStoreServiceFactory.java
index 2730d595560..8fc2770c0ef 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/DataStoreServiceFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/DataStoreServiceFactory.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.generic.server.business;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.GenericSharedConstants.DATA_STORE_SERVER_SERVICE_NAME;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/DeletionUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/DeletionUtils.java
index 8cc1d2dea86..3c070e91051 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/DeletionUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/DeletionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 ETH Zuerich, SIS
+ * 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.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.generic.server.business;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/EntityOperationChecker.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/EntityOperationChecker.java
index 06ab06838b9..043e4797b40 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/EntityOperationChecker.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/EntityOperationChecker.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.generic.server.business;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/IDataStoreServiceFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/IDataStoreServiceFactory.java
index 900d8cfcadd..ac0f85e6d60 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/IDataStoreServiceFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/IDataStoreServiceFactory.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.generic.server.business;
 
 import ch.systemsx.cisd.common.logging.LogLevel;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/IEntityOperationChecker.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/IEntityOperationChecker.java
index da2ba2cee3c..48ec82705e3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/IEntityOperationChecker.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/IEntityOperationChecker.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.generic.server.business;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/IPropertiesBatchManager.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/IPropertiesBatchManager.java
index 4774b67a47e..045fb1cb15e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/IPropertiesBatchManager.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/IPropertiesBatchManager.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.generic.server.business;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/IRelationshipService.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/IRelationshipService.java
index 4c0d972785c..36dcaf5c7ad 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/IRelationshipService.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/IRelationshipService.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.generic.server.business;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/IServiceConversationClientManagerLocal.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/IServiceConversationClientManagerLocal.java
index 50470a60ed9..dfa27727981 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/IServiceConversationClientManagerLocal.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/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.generic.server.business;
 
 import ch.systemsx.cisd.openbis.generic.shared.IDataStoreService;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/IServiceConversationServerManagerLocal.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/IServiceConversationServerManagerLocal.java
index b466623d709..84c53d23a3e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/IServiceConversationServerManagerLocal.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/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.generic.server.business;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/PropertiesBatchEvaluationErrors.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/PropertiesBatchEvaluationErrors.java
index 817cb261ba7..95b36dae65a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/PropertiesBatchEvaluationErrors.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/PropertiesBatchEvaluationErrors.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.generic.server.business;
 
 import java.io.PrintWriter;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/PropertiesBatchManager.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/PropertiesBatchManager.java
index 6d7642dce82..c679806b2e7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/PropertiesBatchManager.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/PropertiesBatchManager.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.generic.server.business;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/RelationshipService.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/RelationshipService.java
index 254abf2f5ef..22b2a62b7c6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/RelationshipService.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/RelationshipService.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.generic.server.business;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObject.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObject.java
index e617c875abd..20b93c417f1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObject.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.server.business.bo;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObjectFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObjectFactory.java
index a83578a6ff5..29fbb91f9cd 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObjectFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObjectFactory.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.generic.server.business.bo;
 
 import java.util.Properties;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractDataSetBusinessObject.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractDataSetBusinessObject.java
index 82052ab79a3..eb289d9ef5f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractDataSetBusinessObject.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractDataSetBusinessObject.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.generic.server.business.bo;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractMaterialBusinessObject.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractMaterialBusinessObject.java
index a5ff5c9675d..a8679a75c73 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractMaterialBusinessObject.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractMaterialBusinessObject.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.generic.server.business.bo;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractSampleBusinessObject.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractSampleBusinessObject.java
index 4891b0dc8e7..cb92e56d89a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractSampleBusinessObject.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractSampleBusinessObject.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.generic.server.business.bo;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractSampleIdentifierBusinessObject.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractSampleIdentifierBusinessObject.java
index c5bb6938f02..3a01738b0e9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractSampleIdentifierBusinessObject.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractSampleIdentifierBusinessObject.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.generic.server.business.bo;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AttachmentBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AttachmentBO.java
index 5fab8f5a0e7..3ee3321f354 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AttachmentBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AttachmentBO.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.generic.server.business.bo;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AuthorizationGroupBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AuthorizationGroupBO.java
index c4619477454..f54782ffcb1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AuthorizationGroupBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AuthorizationGroupBO.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.generic.server.business.bo;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/CorePluginTable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/CorePluginTable.java
index b0aa1d8e689..bd88d1a9aad 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/CorePluginTable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/CorePluginTable.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.generic.server.business.bo;
 
 import java.util.Collections;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataAccessExceptionTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataAccessExceptionTranslator.java
index 4d6a22d970d..812d9e68fe9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataAccessExceptionTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataAccessExceptionTranslator.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.generic.server.business.bo;
 
 import java.sql.SQLException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBO.java
index 6e5b29b5c0b..63b04509b99 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBO.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.generic.server.business.bo;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataSetTable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataSetTable.java
index eae09eeb7dd..e8cdcea1b11 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataSetTable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataSetTable.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.generic.server.business.bo;
 
 import static ch.systemsx.cisd.openbis.generic.shared.translator.DataSetTranslator.translateToDescription;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataStoreBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataStoreBO.java
index b29891c89dc..521702f3b5b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataStoreBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataStoreBO.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.generic.server.business.bo;
 
 import ch.systemsx.cisd.common.exceptions.ConfigurationFailureException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DeletedDataSetTable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DeletedDataSetTable.java
index a050a60676a..4a012e8c5bc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DeletedDataSetTable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DeletedDataSetTable.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.generic.server.business.bo;
 
 /*
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DeletionTable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DeletionTable.java
index 1ec091f47f2..2dd0f4355f5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DeletionTable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DeletionTable.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.generic.server.business.bo;
 
 import java.util.Collections;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityCodeGenerator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityCodeGenerator.java
index 9a206c8ad57..4347a725e70 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityCodeGenerator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityCodeGenerator.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.generic.server.business.bo;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityObjectIdHelper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityObjectIdHelper.java
index 2bfc2876586..4a0ee873ba4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityObjectIdHelper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityObjectIdHelper.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.generic.server.business.bo;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.id.IObjectId;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypeBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypeBO.java
index 5c1ea6a7015..33104c3d1e7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypeBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypeBO.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.generic.server.business.bo;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypePropertyTypeBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypePropertyTypeBO.java
index 7f4a9623b92..0f3992a2de9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypePropertyTypeBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypePropertyTypeBO.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.generic.server.business.bo;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentBO.java
index 92803d193c0..30e6819a339 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentBO.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.generic.server.business.bo;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentTable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentTable.java
index e8acdb26b5a..ea079d6def6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentTable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.server.business.bo;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/GridCustomColumnBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/GridCustomColumnBO.java
index efb3b99650a..74a16df28f0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/GridCustomColumnBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/GridCustomColumnBO.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.generic.server.business.bo;
 
 import java.util.HashSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/GridCustomFilterBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/GridCustomFilterBO.java
index 9198cd8b55c..3fdbb25aa3b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/GridCustomFilterBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/GridCustomFilterBO.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.generic.server.business.bo;
 
 import org.springframework.dao.DataAccessException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IAbstractBussinessObjectFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IAbstractBussinessObjectFactory.java
index 7eb0f58ccdf..ca5aed97132 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IAbstractBussinessObjectFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IAbstractBussinessObjectFactory.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.generic.server.business.bo;
 
 import ch.systemsx.cisd.openbis.generic.server.business.bo.materiallister.IMaterialLister;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IAttachmentBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IAttachmentBO.java
index a9e3fd0c8dd..276cf73951d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IAttachmentBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IAttachmentBO.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.generic.server.business.bo;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IAuthorizationGroupBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IAuthorizationGroupBO.java
index a36e6818820..98c88a6b33c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IAuthorizationGroupBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IAuthorizationGroupBO.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.generic.server.business.bo;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IBusinessObject.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IBusinessObject.java
index d5978062ffa..6d4bf237178 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IBusinessObject.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IBusinessObject.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.openbis.generic.server.business.bo;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ICommonBusinessObjectFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ICommonBusinessObjectFactory.java
index d092f65a723..a7a9eed4fc3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ICommonBusinessObjectFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ICommonBusinessObjectFactory.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.generic.server.business.bo;
 
 import ch.systemsx.cisd.openbis.generic.server.business.bo.datasetlister.IDatasetLister;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ICorePluginTable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ICorePluginTable.java
index 311e72eb78d..00f32e3f961 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ICorePluginTable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ICorePluginTable.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.generic.server.business.bo;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDataBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDataBO.java
index 6f82ed54e8b..964d4bf81a3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDataBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDataBO.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.generic.server.business.bo;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDataSetTable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDataSetTable.java
index 052fafdfa4a..2df19c1dee9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDataSetTable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDataSetTable.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.generic.server.business.bo;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDataStoreBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDataStoreBO.java
index 0058fc68068..b63dc5159d4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDataStoreBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDataStoreBO.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.generic.server.business.bo;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.CustomImportFile;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDeletedDataSetTable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDeletedDataSetTable.java
index 7f7d9750027..2d9c4c76dcc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDeletedDataSetTable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDeletedDataSetTable.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.generic.server.business.bo;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDeletionTable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDeletionTable.java
index 627aca75d94..de042539cf5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDeletionTable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDeletionTable.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.generic.server.business.bo;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDynamicPropertiesUpdateChecker.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDynamicPropertiesUpdateChecker.java
index dc6240c50fb..80dc228b93c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDynamicPropertiesUpdateChecker.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDynamicPropertiesUpdateChecker.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.generic.server.business.bo;
 
 import java.util.Set;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IEntityBusinessObject.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IEntityBusinessObject.java
index 0b603a5eacb..44bcae5aeea 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IEntityBusinessObject.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IEntityBusinessObject.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.openbis.generic.server.business.bo;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IEntityTypeBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IEntityTypeBO.java
index 3830cd17404..4dde479c7b4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IEntityTypeBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IEntityTypeBO.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.generic.server.business.bo;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IEntityTypePropertyTypeBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IEntityTypePropertyTypeBO.java
index 2628662fbbc..86f18a5d3f9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IEntityTypePropertyTypeBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IEntityTypePropertyTypeBO.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.generic.server.business.bo;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewETPTAssignment;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IExperimentBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IExperimentBO.java
index 0620a080dbb..06c99a6cfa1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IExperimentBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IExperimentBO.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.generic.server.business.bo;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IExperimentTable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IExperimentTable.java
index 1c159f2d5b9..ba7cd4cbc5a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IExperimentTable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IExperimentTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.server.business.bo;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IExternalDataTable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IExternalDataTable.java
index 9b6884a6062..7ec05c80771 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IExternalDataTable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IExternalDataTable.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.generic.server.business.bo;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IGridCustomFilterOrColumnBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IGridCustomFilterOrColumnBO.java
index e1be193dd8e..84eb0958eab 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IGridCustomFilterOrColumnBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IGridCustomFilterOrColumnBO.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.generic.server.business.bo;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IMaterialBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IMaterialBO.java
index 895116c22b3..24b8a98e64d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IMaterialBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IMaterialBO.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.generic.server.business.bo;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IMaterialTable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IMaterialTable.java
index 0a2532fcef3..c80794f73b3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IMaterialTable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IMaterialTable.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.openbis.generic.server.business.bo;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IMetaprojectBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IMetaprojectBO.java
index cb5f5efd309..127bc171967 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IMetaprojectBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IMetaprojectBO.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.generic.server.business.bo;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IProjectBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IProjectBO.java
index 27fdae0b416..c0151bccd38 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IProjectBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IProjectBO.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.generic.server.business.bo;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IPropertyTypeBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IPropertyTypeBO.java
index 702b1906929..3d0369e5581 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IPropertyTypeBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IPropertyTypeBO.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.generic.server.business.bo;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IPropertyTypeTable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IPropertyTypeTable.java
index c3bd0061a9b..412702ef2c5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IPropertyTypeTable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IPropertyTypeTable.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.generic.server.business.bo;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IRoleAssignmentTable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IRoleAssignmentTable.java
index c2a5e8c5c9a..6f922f1c9b1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IRoleAssignmentTable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IRoleAssignmentTable.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.generic.server.business.bo;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.NewRoleAssignment;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ISampleBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ISampleBO.java
index f5a4ac28092..595040071f3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ISampleBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ISampleBO.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.generic.server.business.bo;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ISampleTable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ISampleTable.java
index b3ca6abbebe..65cad520f01 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ISampleTable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ISampleTable.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.generic.server.business.bo;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IScriptBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IScriptBO.java
index dd92608cda4..310d4b2d964 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IScriptBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IScriptBO.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.generic.server.business.bo;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ISearchDomainSearcher.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ISearchDomainSearcher.java
index fd43a14b9a5..82ffc0c5079 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ISearchDomainSearcher.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ISearchDomainSearcher.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.generic.server.business.bo;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ISpaceBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ISpaceBO.java
index a39a4974804..ca3461bc490 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ISpaceBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ISpaceBO.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.generic.server.business.bo;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ITrashBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ITrashBO.java
index 67ab2e753e7..d480d4b8adf 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ITrashBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ITrashBO.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.generic.server.business.bo;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IVocabularyBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IVocabularyBO.java
index 3c1fe5cfd58..5ba860737d4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IVocabularyBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IVocabularyBO.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.generic.server.business.bo;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IVocabularyTermBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IVocabularyTermBO.java
index 842e746755b..988db081b9d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IVocabularyTermBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IVocabularyTermBO.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.generic.server.business.bo;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/InternalPropertyTypeAuthorization.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/InternalPropertyTypeAuthorization.java
index f8be5963f7c..7362b19b9d5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/InternalPropertyTypeAuthorization.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/InternalPropertyTypeAuthorization.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.systemsx.cisd.openbis.generic.server.business.bo;
 
 import ch.systemsx.cisd.common.exceptions.AuthorizationFailureException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/InternalVocabularyAuthorization.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/InternalVocabularyAuthorization.java
index 1ecf6e1860f..6f30f1e728e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/InternalVocabularyAuthorization.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/InternalVocabularyAuthorization.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.systemsx.cisd.openbis.generic.server.business.bo;
 
 import ch.systemsx.cisd.common.exceptions.AuthorizationFailureException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/MaterialBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/MaterialBO.java
index 53a60ef7c5d..c003e169ed0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/MaterialBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/MaterialBO.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.generic.server.business.bo;
 
 import java.util.Collections;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/MaterialTable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/MaterialTable.java
index 969a4b1c577..8dc6902e933 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/MaterialTable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/MaterialTable.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.generic.server.business.bo;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/MetaprojectBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/MetaprojectBO.java
index 72237655c2c..ec8de1ef045 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/MetaprojectBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/MetaprojectBO.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.generic.server.business.bo;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/NewDataSetToSampleExperimentAssignmentManager.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/NewDataSetToSampleExperimentAssignmentManager.java
index a4139e35468..acc4c078b8e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/NewDataSetToSampleExperimentAssignmentManager.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/NewDataSetToSampleExperimentAssignmentManager.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.generic.server.business.bo;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/NextExceptionFallbackExceptionTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/NextExceptionFallbackExceptionTranslator.java
index e4eff0faedf..558fc928996 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/NextExceptionFallbackExceptionTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/NextExceptionFallbackExceptionTranslator.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.generic.server.business.bo;
 
 import java.sql.SQLException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ProjectBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ProjectBO.java
index b9a54bacf43..9e13d210cce 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ProjectBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ProjectBO.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.generic.server.business.bo;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyTypeBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyTypeBO.java
index 0f675f861d7..26f2dfd5e30 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyTypeBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyTypeBO.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.generic.server.business.bo;
 
 import java.util.Collections;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyTypeTable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyTypeTable.java
index 1626d9d4369..f65e2330fbf 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyTypeTable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyTypeTable.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.generic.server.business.bo;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/RoleAssignmentTable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/RoleAssignmentTable.java
index 471adf3cda8..6915bf167ef 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/RoleAssignmentTable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/RoleAssignmentTable.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.generic.server.business.bo;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/RootEntitiesFinder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/RootEntitiesFinder.java
index cd14721dc50..b34202ae19d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/RootEntitiesFinder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/RootEntitiesFinder.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.generic.server.business.bo;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleBO.java
index 467a28dbafe..1143e8db3af 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleBO.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.generic.server.business.bo;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleCodeGeneratorByType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleCodeGeneratorByType.java
index 405afeae627..02bc7c7a91f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleCodeGeneratorByType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleCodeGeneratorByType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.generic.server.business.bo;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleCodeGeneratorForTempCodes.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleCodeGeneratorForTempCodes.java
index 8e65ebddc75..869779d7928 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleCodeGeneratorForTempCodes.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleCodeGeneratorForTempCodes.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.generic.server.business.bo;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleGenericBusinessRules.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleGenericBusinessRules.java
index ed5bb218382..7c2f5bbd4a7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleGenericBusinessRules.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleGenericBusinessRules.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.generic.server.business.bo;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleHierarchyFiller.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleHierarchyFiller.java
index a72ebe14e84..3f13a976ccd 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleHierarchyFiller.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleHierarchyFiller.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.generic.server.business.bo;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleTable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleTable.java
index 95c9fa866fc..e418d1afd02 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleTable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleTable.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.generic.server.business.bo;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ScriptBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ScriptBO.java
index 58c32c8eda0..a3f2f6bd653 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ScriptBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ScriptBO.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.generic.server.business.bo;
 
 import org.springframework.dao.DataAccessException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SearchDomainSearcher.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SearchDomainSearcher.java
index 0d93dbb9066..972870e7a2e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SearchDomainSearcher.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SearchDomainSearcher.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.generic.server.business.bo;
 
 import java.net.ConnectException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SpaceBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SpaceBO.java
index 06a0d409b65..4a632bc043a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SpaceBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SpaceBO.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.generic.server.business.bo;
 
 import java.util.Collections;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/TrashBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/TrashBO.java
index 8ebdc785f16..d32bbd571d7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/TrashBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/TrashBO.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.generic.server.business.bo;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/VocabularyBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/VocabularyBO.java
index 715943145fc..7ce21ff52b1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/VocabularyBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/VocabularyBO.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.generic.server.business.bo;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/VocabularyTermBO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/VocabularyTermBO.java
index bc659b91b06..890e8bab894 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/VocabularyTermBO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/VocabularyTermBO.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.generic.server.business.bo;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/AbstractBatchIterator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/AbstractBatchIterator.java
index f90e99a5863..9b9cc6299f4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/AbstractBatchIterator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/AbstractBatchIterator.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.generic.server.business.bo.common;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/AbstractDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/AbstractDAO.java
index 9a036c98b8d..6da9f40b62a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/AbstractDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/AbstractDAO.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.generic.server.business.bo.common;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseInstance;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/BaseEntityPropertyRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/BaseEntityPropertyRecord.java
index 2e0a4d6ada2..241e49ef2f2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/BaseEntityPropertyRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/BaseEntityPropertyRecord.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.server.business.bo.common;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/CodeRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/CodeRecord.java
index 5bf540328bc..1b85a75e76f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/CodeRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/CodeRecord.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.server.business.bo.common;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/DatabaseContextUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/DatabaseContextUtils.java
index 96941b1a19e..83c6e8e73c7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/DatabaseContextUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/DatabaseContextUtils.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.generic.server.business.bo.common;
 
 import ch.systemsx.cisd.common.exceptions.ConfigurationFailureException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/EntityPropertiesEnricher.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/EntityPropertiesEnricher.java
index de7745d28b9..6dcc6a169fc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/EntityPropertiesEnricher.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/EntityPropertiesEnricher.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.generic.server.business.bo.common;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/GenericEntityPropertyRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/GenericEntityPropertyRecord.java
index cc7e4ebfb0a..06bf873a208 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/GenericEntityPropertyRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/GenericEntityPropertyRecord.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.server.business.bo.common;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/IEntityPropertiesEnricher.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/IEntityPropertiesEnricher.java
index cd17994c5d6..9aad3c195ee 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/IEntityPropertiesEnricher.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/IEntityPropertiesEnricher.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.generic.server.business.bo.common;
 
 import it.unimi.dsi.fastutil.longs.LongSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/IEntityPropertiesHolderResolver.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/IEntityPropertiesHolderResolver.java
index 8938e555906..dd0a8dc88af 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/IEntityPropertiesHolderResolver.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/IEntityPropertiesHolderResolver.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.generic.server.business.bo.common;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IEntityPropertiesHolder;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/IEntityPropertySetListingQuery.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/IEntityPropertySetListingQuery.java
index 8633f5ad2be..205f025d7c7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/IEntityPropertySetListingQuery.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/IEntityPropertySetListingQuery.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.generic.server.business.bo.common;
 
 import it.unimi.dsi.fastutil.longs.LongSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/IPropertyListingQuery.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/IPropertyListingQuery.java
index 3dd520cd0ff..52836a00ebf 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/IPropertyListingQuery.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/IPropertyListingQuery.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.generic.server.business.bo.common;
 
 import net.lemnik.eodsql.DataIterator;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/MaterialEntityPropertyRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/MaterialEntityPropertyRecord.java
index b854de265d7..6b272e026d9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/MaterialEntityPropertyRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/MaterialEntityPropertyRecord.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.server.business.bo.common;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/PropertyTypeDataObjectBinding.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/PropertyTypeDataObjectBinding.java
index 9cd1cb85abd..73590d87a96 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/PropertyTypeDataObjectBinding.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/PropertyTypeDataObjectBinding.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.server.business.bo.common;
 
 import java.sql.ResultSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/SampleEntityPropertyRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/SampleEntityPropertyRecord.java
index c5ad3a82ea5..bce2cfa4afb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/SampleEntityPropertyRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/SampleEntityPropertyRecord.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.server.business.bo.common;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/VocabularyTermRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/VocabularyTermRecord.java
index b1e9add77c3..8a38095f669 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/VocabularyTermRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/VocabularyTermRecord.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.server.business.bo.common;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/AbstractLister.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/AbstractLister.java
index 159aec561da..8f3a7f7af0f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/AbstractLister.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/AbstractLister.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.generic.server.business.bo.common.entity;
 
 import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/ExperimentProjectSpaceCodeRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/ExperimentProjectSpaceCodeRecord.java
index 1a71d998fc5..8cc59624ee5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/ExperimentProjectSpaceCodeRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/ExperimentProjectSpaceCodeRecord.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.server.business.bo.common.entity;
 
 import ch.rinn.restrictions.Private;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/ISecondaryEntityListingQuery.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/ISecondaryEntityListingQuery.java
index b4b24a57ec7..777b853d021 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/ISecondaryEntityListingQuery.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/ISecondaryEntityListingQuery.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.generic.server.business.bo.common.entity;
 
 import it.unimi.dsi.fastutil.longs.LongSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/SampleReferenceRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/SampleReferenceRecord.java
index b331e19e37c..da302acb5e3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/SampleReferenceRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/SampleReferenceRecord.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.generic.server.business.bo.common.entity;
 
 import ch.rinn.restrictions.Private;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/SecondaryEntityDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/SecondaryEntityDAO.java
index 44e27cef917..a714f79347b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/SecondaryEntityDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/SecondaryEntityDAO.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.generic.server.business.bo.common.entity;
 
 import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/ContentCopyRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/ContentCopyRecord.java
index c88e46bc2d8..8ff0724b352 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/ContentCopyRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/ContentCopyRecord.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.generic.server.business.bo.datasetlister;
 
 import ch.rinn.restrictions.Private;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DataSetTypeRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DataSetTypeRecord.java
index 8bd9cfa3fb4..1b0a845e643 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DataSetTypeRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DataSetTypeRecord.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.generic.server.business.bo.datasetlister;
 
 import ch.systemsx.cisd.openbis.generic.server.business.bo.common.CodeRecord;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DataStoreRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DataStoreRecord.java
index 39c913e3e79..8ef541ff67a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DataStoreRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DataStoreRecord.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.generic.server.business.bo.datasetlister;
 
 import ch.rinn.restrictions.Private;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetCodeWithShareIdRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetCodeWithShareIdRecord.java
index 46d384f486e..5985ee43876 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetCodeWithShareIdRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetCodeWithShareIdRecord.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.generic.server.business.bo.datasetlister;
 
 import ch.rinn.restrictions.Private;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java
index 51c6ff42c95..ab1e777c813 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLister.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.generic.server.business.bo.datasetlister;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetListerDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetListerDAO.java
index d9206e54cdb..69f0137bc88 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetListerDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetListerDAO.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.generic.server.business.bo.datasetlister;
 
 import it.unimi.dsi.fastutil.longs.LongSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLocationNodeRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLocationNodeRecord.java
index 2d0a31e0679..ed1aa0ae6c1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLocationNodeRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetLocationNodeRecord.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.generic.server.business.bo.datasetlister;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetRecord.java
index 033e8c41f7a..6ed0509bb64 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetRecord.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.server.business.bo.datasetlister;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetRelationRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetRelationRecord.java
index c39914f649e..01166a2e62d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetRelationRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetRelationRecord.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.generic.server.business.bo.datasetlister;
 
 import ch.rinn.restrictions.Private;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetVersionRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetVersionRecord.java
index 1028856a963..7c734286424 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetVersionRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetVersionRecord.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.generic.server.business.bo.datasetlister;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/ExternalDataManagementSystemRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/ExternalDataManagementSystemRecord.java
index 468c62d1830..eb9bfb52dd3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/ExternalDataManagementSystemRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/ExternalDataManagementSystemRecord.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.generic.server.business.bo.datasetlister;
 
 import ch.systemsx.cisd.openbis.generic.server.business.bo.common.CodeRecord;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/IDatasetLister.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/IDatasetLister.java
index 28b14a68878..e40b6d4af86 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/IDatasetLister.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/IDatasetLister.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.generic.server.business.bo.datasetlister;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/IDatasetListingQuery.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/IDatasetListingQuery.java
index 13a5b6ff380..a8581805572 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/IDatasetListingQuery.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/IDatasetListingQuery.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.generic.server.business.bo.datasetlister;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/exception/DataSetDeletionDisallowedTypesException.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/exception/DataSetDeletionDisallowedTypesException.java
index ae7763ba357..87e187222d8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/exception/DataSetDeletionDisallowedTypesException.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/exception/DataSetDeletionDisallowedTypesException.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.generic.server.business.bo.exception;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/exception/DataSetDeletionUnknownLocationsException.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/exception/DataSetDeletionUnknownLocationsException.java
index a961df6fe7a..37bba715c08 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/exception/DataSetDeletionUnknownLocationsException.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/exception/DataSetDeletionUnknownLocationsException.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.generic.server.business.bo.exception;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/common/EntityMetaprojectRelationRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/common/EntityMetaprojectRelationRecord.java
index 6824073ba5f..cea73c195bb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/common/EntityMetaprojectRelationRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/common/EntityMetaprojectRelationRecord.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.generic.server.business.bo.fetchoptions.common;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/common/MetaProjectWithEntityId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/common/MetaProjectWithEntityId.java
index a5a2552c28f..285a59e8e97 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/common/MetaProjectWithEntityId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/common/MetaProjectWithEntityId.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.generic.server.business.bo.fetchoptions.common;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/common/MetaprojectCreator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/common/MetaprojectCreator.java
index 03829e60b60..64b23b9ab79 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/common/MetaprojectCreator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/common/MetaprojectCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.generic.server.business.bo.fetchoptions.common;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Metaproject;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/common/MetaprojectRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/common/MetaprojectRecord.java
index 0bfb85f77d4..001b3fb17a9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/common/MetaprojectRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/common/MetaprojectRecord.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.generic.server.business.bo.fetchoptions.common;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/common/PropertyRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/common/PropertyRecord.java
index dd479a837ae..0c6ce593e6c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/common/PropertyRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/common/PropertyRecord.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.generic.server.business.bo.fetchoptions.common;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.MaterialIdentifier;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetDownloadRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetDownloadRecord.java
index 0531536a73d..77281a49ecf 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetDownloadRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetDownloadRecord.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.generic.server.business.bo.fetchoptions.datasetlister;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetLister.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetLister.java
index 98abfca6f10..4c5804b939c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetLister.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetLister.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.generic.server.business.bo.fetchoptions.datasetlister;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetRecord.java
index 02f09feb7b5..49db9da2c93 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetRecord.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.generic.server.business.bo.fetchoptions.datasetlister;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetRelationRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetRelationRecord.java
index e0038e20fa7..bfafba45557 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetRelationRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetRelationRecord.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.generic.server.business.bo.fetchoptions.datasetlister;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/IDataSetLister.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/IDataSetLister.java
index cab3dc4d91a..10c5283c930 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/IDataSetLister.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/IDataSetLister.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.generic.server.business.bo.fetchoptions.datasetlister;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/IDataSetListingQuery.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/IDataSetListingQuery.java
index 129f797b853..09db48c6ad4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/IDataSetListingQuery.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/IDataSetListingQuery.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.generic.server.business.bo.fetchoptions.datasetlister;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/experimentlister/ExperimentLister.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/experimentlister/ExperimentLister.java
index dc7ed603ce4..f0e859ddc97 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/experimentlister/ExperimentLister.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/experimentlister/ExperimentLister.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.generic.server.business.bo.fetchoptions.experimentlister;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/experimentlister/ExperimentRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/experimentlister/ExperimentRecord.java
index 0654bbc28a3..e683274843a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/experimentlister/ExperimentRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/experimentlister/ExperimentRecord.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.generic.server.business.bo.fetchoptions.experimentlister;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/experimentlister/IExperimentLister.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/experimentlister/IExperimentLister.java
index 4389cf245b1..1e5bb9c269b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/experimentlister/IExperimentLister.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/experimentlister/IExperimentLister.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.generic.server.business.bo.fetchoptions.experimentlister;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/experimentlister/IExperimentListingQuery.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/experimentlister/IExperimentListingQuery.java
index b96834aedbd..db4b85fa13f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/experimentlister/IExperimentListingQuery.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/experimentlister/IExperimentListingQuery.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.generic.server.business.bo.fetchoptions.experimentlister;
 
 import net.lemnik.eodsql.BaseQuery;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/samplelister/ISampleLister.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/samplelister/ISampleLister.java
index 50bd4a8ca36..04b7ec13819 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/samplelister/ISampleLister.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/samplelister/ISampleLister.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.generic.server.business.bo.fetchoptions.samplelister;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/samplelister/ISampleListingQuery.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/samplelister/ISampleListingQuery.java
index 7b446a6a839..c0d277196cc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/samplelister/ISampleListingQuery.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/samplelister/ISampleListingQuery.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.generic.server.business.bo.fetchoptions.samplelister;
 
 import it.unimi.dsi.fastutil.longs.LongSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/samplelister/SampleLister.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/samplelister/SampleLister.java
index 8048450ace1..84da811402e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/samplelister/SampleLister.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/samplelister/SampleLister.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.generic.server.business.bo.fetchoptions.samplelister;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/samplelister/SampleRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/samplelister/SampleRecord.java
index ce5cb37886d..d5565729094 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/samplelister/SampleRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/samplelister/SampleRecord.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.generic.server.business.bo.fetchoptions.samplelister;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/samplelister/SampleRelationshipRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/samplelister/SampleRelationshipRecord.java
index f681dc33785..295974685fe 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/samplelister/SampleRelationshipRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/samplelister/SampleRelationshipRecord.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.generic.server.business.bo.fetchoptions.samplelister;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/managed_property/EntityInformationProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/managed_property/EntityInformationProvider.java
index 3168a99c49b..345ee872f01 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/managed_property/EntityInformationProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/managed_property/EntityInformationProvider.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.generic.server.business.bo.managed_property;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/IMaterialLister.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/IMaterialLister.java
index 55333e950cf..35877c71c78 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/IMaterialLister.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/IMaterialLister.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.generic.server.business.bo.materiallister;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/IMaterialListingQuery.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/IMaterialListingQuery.java
index 8fafaa80089..973f63c199f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/IMaterialListingQuery.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/IMaterialListingQuery.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.generic.server.business.bo.materiallister;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/MaterialLister.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/MaterialLister.java
index b0786f4d793..d00b3dbed11 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/MaterialLister.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/MaterialLister.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.generic.server.business.bo.materiallister;
 
 import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/MaterialListerDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/MaterialListerDAO.java
index 72723023e85..746b1f956e7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/MaterialListerDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/MaterialListerDAO.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.generic.server.business.bo.materiallister;
 
 import ch.rinn.restrictions.Friend;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/MaterialRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/MaterialRecord.java
index 2339abb9c1d..35a5d6ddec8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/MaterialRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/MaterialRecord.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.generic.server.business.bo.materiallister;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/ISampleLister.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/ISampleLister.java
index 538fd7448bd..31e089cb0ac 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/ISampleLister.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/ISampleLister.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.generic.server.business.bo.samplelister;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/ISampleListingQuery.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/ISampleListingQuery.java
index 791d909508a..2fcf5123df1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/ISampleListingQuery.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/ISampleListingQuery.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.generic.server.business.bo.samplelister;
 
 import java.sql.ResultSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleLister.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleLister.java
index 119e5f91f14..76307d0f99e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleLister.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleLister.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.generic.server.business.bo.samplelister;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListerDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListerDAO.java
index 096e0b20a90..07e903112c1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListerDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListerDAO.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.generic.server.business.bo.samplelister;
 
 import ch.rinn.restrictions.Friend;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingWorker.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingWorker.java
index e2afe2bb274..83b5aba703c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingWorker.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingWorker.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.generic.server.business.bo.samplelister;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleRecord.java
index ad6b66a3053..d3801b50f40 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleRecord.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.server.business.bo.samplelister;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleRelationRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleRelationRecord.java
index 8e8b1f99c13..44c851efe4f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleRelationRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleRelationRecord.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.generic.server.business.bo.samplelister;
 
 import ch.rinn.restrictions.Private;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleVersionRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleVersionRecord.java
index ab2094bbf7c..6c37d5d5e56 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleVersionRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleVersionRecord.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.generic.server.business.bo.samplelister;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/util/DataSetRegistrationCache.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/util/DataSetRegistrationCache.java
index 75e5db45be6..0b7453de411 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/util/DataSetRegistrationCache.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/util/DataSetRegistrationCache.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.generic.server.business.bo.util;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/util/DataSetTypeWithoutExperimentChecker.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/util/DataSetTypeWithoutExperimentChecker.java
index a9f64c3187f..bf76f6c78ab 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/util/DataSetTypeWithoutExperimentChecker.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/util/DataSetTypeWithoutExperimentChecker.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.generic.server.business.bo.util;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/util/DataSetUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/util/DataSetUtils.java
index f72f40ebc84..1287b19cdf0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/util/DataSetUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/util/DataSetUtils.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.generic.server.business.bo.util;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/util/SampleOwner.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/util/SampleOwner.java
index 6f60649dffe..778d7b2f257 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/util/SampleOwner.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/util/SampleOwner.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2008 - 2023 Zürich, Scientific 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.generic.server.business.bo.util;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/util/SampleOwnerFinder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/util/SampleOwnerFinder.java
index e9a2a949617..62f934fc827 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/util/SampleOwnerFinder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/util/SampleOwnerFinder.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.generic.server.business.bo.util;
 
 import ch.systemsx.cisd.common.exceptions.InternalErr;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/util/SampleUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/util/SampleUtils.java
index f8a200e459f..650d8c0b2df 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/util/SampleUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/util/SampleUtils.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.generic.server.business.bo.util;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/importer/DatabaseInstance.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/importer/DatabaseInstance.java
index 120bee3bddc..1132d7c3a04 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/importer/DatabaseInstance.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/importer/DatabaseInstance.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.generic.server.business.importer;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/importer/DatabaseInstanceImporter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/importer/DatabaseInstanceImporter.java
index 070f276f9e8..2586a47a9f4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/importer/DatabaseInstanceImporter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/importer/DatabaseInstanceImporter.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.generic.server.business.importer;
 
 import java.io.BufferedWriter;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/importer/IDatabaseDumper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/importer/IDatabaseDumper.java
index 2f45fd4f4ce..97e4ee2a99b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/importer/IDatabaseDumper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/importer/IDatabaseDumper.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.generic.server.business.importer;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/importer/Parameters.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/importer/Parameters.java
index a3759b3e1d1..8f251236f0f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/importer/Parameters.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/importer/Parameters.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.generic.server.business.importer;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/AbstractSearchManager.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/AbstractSearchManager.java
index 71622897009..00d67006759 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/AbstractSearchManager.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/AbstractSearchManager.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.generic.server.business.search;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/DataSetSearchManager.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/DataSetSearchManager.java
index ac60d017ec7..37b4ee60e39 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/DataSetSearchManager.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/DataSetSearchManager.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.generic.server.business.search;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/ExperimentSearchManager.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/ExperimentSearchManager.java
index c3c10c39ce2..cfe16d0ecb8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/ExperimentSearchManager.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/ExperimentSearchManager.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.generic.server.business.search;
 
 import static ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind.EXPERIMENT;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/MaterialSearchManager.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/MaterialSearchManager.java
index cc253319b43..5ea46bcac1a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/MaterialSearchManager.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/MaterialSearchManager.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.generic.server.business.search;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/SampleSearchManager.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/SampleSearchManager.java
index 387a2787381..1fb7fb7d507 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/SampleSearchManager.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/SampleSearchManager.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.generic.server.business.search;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/sort/IEntitySearchResult.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/sort/IEntitySearchResult.java
index fe576266c1e..5907d76a510 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/sort/IEntitySearchResult.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/sort/IEntitySearchResult.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.
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/sort/ISearchResultSorter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/sort/ISearchResultSorter.java
index eb57fcb7b8b..53ef4a9bbab 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/sort/ISearchResultSorter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/sort/ISearchResultSorter.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.
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/sort/SearchResultSorterByScore.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/sort/SearchResultSorterByScore.java
index 84047fa9bc1..fbdb7b5cd00 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/sort/SearchResultSorterByScore.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/business/search/sort/SearchResultSorterByScore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 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.
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/AsCorePluginPaths.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/AsCorePluginPaths.java
index 72ff1c19355..19bce1d99dc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/AsCorePluginPaths.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/AsCorePluginPaths.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.generic.server.coreplugin;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/CorePluginRegistrator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/CorePluginRegistrator.java
index a537a876049..8d791f7140d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/CorePluginRegistrator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/CorePluginRegistrator.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.generic.server.coreplugin;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/CorePluginsInjectingPropertyPlaceholderConfigurer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/CorePluginsInjectingPropertyPlaceholderConfigurer.java
index bdf670a5496..eb0e91ff121 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/CorePluginsInjectingPropertyPlaceholderConfigurer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/CorePluginsInjectingPropertyPlaceholderConfigurer.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.generic.server.coreplugin;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/JettyWebAppPluginInjector.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/JettyWebAppPluginInjector.java
index 99073b48d73..f2afdfad931 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/JettyWebAppPluginInjector.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/JettyWebAppPluginInjector.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.generic.server.coreplugin;
 
 import static ch.systemsx.cisd.openbis.generic.server.coreplugin.CorePluginsInjectingPropertyPlaceholderConfigurer.PLUGIN_TYPE_WEBAPPS;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/DataStoreServerBasedDataSourceProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/DataStoreServerBasedDataSourceProvider.java
index 12fb05ef6a2..caf01e8f800 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/DataStoreServerBasedDataSourceProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/DataStoreServerBasedDataSourceProvider.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.generic.server.dataaccess;
 
 import static ch.systemsx.cisd.dbmigration.SimpleDatabaseConfigurationContext.DRIVER_KEY;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/DynamicPropertyEvaluationOperation.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/DynamicPropertyEvaluationOperation.java
index f37234f916f..d7969332025 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/DynamicPropertyEvaluationOperation.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/DynamicPropertyEvaluationOperation.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.generic.server.dataaccess;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/DynamicPropertyEvaluationScheduler.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/DynamicPropertyEvaluationScheduler.java
index 52600c2b88e..d8f26bdead9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/DynamicPropertyEvaluationScheduler.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/DynamicPropertyEvaluationScheduler.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.generic.server.dataaccess;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/EntityPropertiesConverter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/EntityPropertiesConverter.java
index 5aeba6aa3e1..2f1407cf270 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/EntityPropertiesConverter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/EntityPropertiesConverter.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.generic.server.dataaccess;
 
 import java.util.*;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/HibernateInterceptorsWrapper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/HibernateInterceptorsWrapper.java
index b32dad95c30..dcfeaaf2672 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/HibernateInterceptorsWrapper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/HibernateInterceptorsWrapper.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.generic.server.dataaccess;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IAttachmentDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IAttachmentDAO.java
index 89e0e20f331..63974525c6b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IAttachmentDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IAttachmentDAO.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.generic.server.dataaccess;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IAuthorizationDAOFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IAuthorizationDAOFactory.java
index 79aa602d130..b41c2e237c2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IAuthorizationDAOFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IAuthorizationDAOFactory.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.generic.server.dataaccess;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.ISampleRelationshipDAO;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IAuthorizationGroupDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IAuthorizationGroupDAO.java
index d89e7e9c527..99f5316cf90 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IAuthorizationGroupDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IAuthorizationGroupDAO.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.generic.server.dataaccess;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/ICorePluginDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/ICorePluginDAO.java
index 8680f24c0d4..ba02f12a4bd 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/ICorePluginDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/ICorePluginDAO.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.generic.server.dataaccess;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDAOFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDAOFactory.java
index 410aa0f1991..d6461ea1801 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDAOFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDAOFactory.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.generic.server.dataaccess;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDataDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDataDAO.java
index 15cf9326070..308c534df03 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDataDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDataDAO.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.generic.server.dataaccess;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDataSetTypeDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDataSetTypeDAO.java
index 3aff8cf7038..6ed1ebfe287 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDataSetTypeDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDataSetTypeDAO.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.generic.server.dataaccess;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.DataSetTypePE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDataSourceProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDataSourceProvider.java
index c0ce9d888a1..e1cd1df9b54 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDataSourceProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDataSourceProvider.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.generic.server.dataaccess;
 
 import javax.sql.DataSource;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDataStoreDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDataStoreDAO.java
index 69ef07c787d..19717745501 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDataStoreDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDataStoreDAO.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.generic.server.dataaccess;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDataStoreDataSourceManager.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDataStoreDataSourceManager.java
index e55215c9b1a..ffdc1ab94ca 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDataStoreDataSourceManager.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDataStoreDataSourceManager.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.generic.server.dataaccess;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDeletionDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDeletionDAO.java
index 24af46b1810..9ba234536ee 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDeletionDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDeletionDAO.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.generic.server.dataaccess;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDynamicPropertyEvaluationScheduler.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDynamicPropertyEvaluationScheduler.java
index 48908b2e7f5..e287aa51e40 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDynamicPropertyEvaluationScheduler.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDynamicPropertyEvaluationScheduler.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.generic.server.dataaccess;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDynamicPropertyEvaluationSchedulerWithQueue.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDynamicPropertyEvaluationSchedulerWithQueue.java
index 567c2c32857..8753b4e627d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDynamicPropertyEvaluationSchedulerWithQueue.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDynamicPropertyEvaluationSchedulerWithQueue.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.generic.server.dataaccess;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEntityHistoryDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEntityHistoryDAO.java
index bbf17b0a3e1..7cc8a6a39eb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEntityHistoryDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEntityHistoryDAO.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.generic.server.dataaccess;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEntityOperationsLogDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEntityOperationsLogDAO.java
index bf336f2ac08..21c485bee34 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEntityOperationsLogDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEntityOperationsLogDAO.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.openbis.generic.server.dataaccess;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.EntityOperationsLogEntryPE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEntityPropertiesConverter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEntityPropertiesConverter.java
index dcb2c5f7f0d..d4fa16d9c50 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEntityPropertiesConverter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEntityPropertiesConverter.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.generic.server.dataaccess;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEntityPropertyTypeDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEntityPropertyTypeDAO.java
index f7d6e35da07..d0b435756e2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEntityPropertyTypeDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEntityPropertyTypeDAO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.server.dataaccess;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEntityTypeDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEntityTypeDAO.java
index e16ed7b839b..7df49930634 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEntityTypeDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEntityTypeDAO.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.generic.server.dataaccess;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEventDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEventDAO.java
index cc6d0bb493b..104908de291 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEventDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEventDAO.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.generic.server.dataaccess;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DeletedDataSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEventsSearchDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEventsSearchDAO.java
index 742b31be29b..1ffc9a5d4ab 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEventsSearchDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEventsSearchDAO.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.generic.server.dataaccess;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.EventPE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IExperimentDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IExperimentDAO.java
index 3b138044e3a..72c8ce789fe 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IExperimentDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IExperimentDAO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.server.dataaccess;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IExternalDataDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IExternalDataDAO.java
index 7d8764d2743..83fe83cdf6c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IExternalDataDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IExternalDataDAO.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.generic.server.dataaccess;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IExternalDataManagementSystemDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IExternalDataManagementSystemDAO.java
index 7820cfb62cb..38f0e0f4052 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IExternalDataManagementSystemDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IExternalDataManagementSystemDAO.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.generic.server.dataaccess;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IFileFormatTypeDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IFileFormatTypeDAO.java
index fe48f2f0e33..2b4840d2619 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IFileFormatTypeDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IFileFormatTypeDAO.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.generic.server.dataaccess;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IGenericDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IGenericDAO.java
index 149028ddae6..801ae552164 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IGenericDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IGenericDAO.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.generic.server.dataaccess;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IGridCustomColumnDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IGridCustomColumnDAO.java
index c0a5adc242d..0ee23b9df41 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IGridCustomColumnDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IGridCustomColumnDAO.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.generic.server.dataaccess;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IGridCustomFilterDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IGridCustomFilterDAO.java
index 34d1611a41a..57f1ee0a772 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IGridCustomFilterDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IGridCustomFilterDAO.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.generic.server.dataaccess;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IHibernateSearchDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IHibernateSearchDAO.java
index 24669feed27..1e716842e18 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IHibernateSearchDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IHibernateSearchDAO.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.generic.server.dataaccess;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/ILocatorTypeDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/ILocatorTypeDAO.java
index badd415758f..0af0ad7db5c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/ILocatorTypeDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/ILocatorTypeDAO.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.generic.server.dataaccess;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.LocatorTypePE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IMaterialDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IMaterialDAO.java
index c52989bb43a..7a9140fe007 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IMaterialDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IMaterialDAO.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.generic.server.dataaccess;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IMetaprojectDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IMetaprojectDAO.java
index 40eb1c4f6e1..7a8eec16394 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IMetaprojectDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IMetaprojectDAO.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.generic.server.dataaccess;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IOperationExecutionDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IOperationExecutionDAO.java
index 2880200a464..e5682be7011 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IOperationExecutionDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IOperationExecutionDAO.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.openbis.generic.server.dataaccess;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IPersonDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IPersonDAO.java
index 95cadae0ad9..33df1a5aef0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IPersonDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IPersonDAO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.server.dataaccess;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IPersonalAccessTokenDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IPersonalAccessTokenDAO.java
index b51129f64cf..50333f69b6b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IPersonalAccessTokenDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IPersonalAccessTokenDAO.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.generic.server.dataaccess;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IPostRegistrationDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IPostRegistrationDAO.java
index 89392c8543e..edda35c55d0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IPostRegistrationDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IPostRegistrationDAO.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.openbis.generic.server.dataaccess;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IProjectDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IProjectDAO.java
index 255f21b5bf6..43666ce7717 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IProjectDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IProjectDAO.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.generic.server.dataaccess;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IPropertyPlaceholderCreator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IPropertyPlaceholderCreator.java
index 7fb8d8e8613..b24ed24e2d8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IPropertyPlaceholderCreator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IPropertyPlaceholderCreator.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.generic.server.dataaccess;
 
 import java.util.Set;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IPropertyTypeDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IPropertyTypeDAO.java
index 02f562aa638..5de7643999b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IPropertyTypeDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IPropertyTypeDAO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.server.dataaccess;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IPropertyValueValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IPropertyValueValidator.java
index 81fba56ee86..5cef2a3d4da 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IPropertyValueValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IPropertyValueValidator.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.generic.server.dataaccess;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IQueryDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IQueryDAO.java
index 0bd7adc76a2..4ed527eebb6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IQueryDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IQueryDAO.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.generic.server.dataaccess;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IRelationshipTypeDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IRelationshipTypeDAO.java
index 3269ee56b6e..67bb9312f29 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IRelationshipTypeDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IRelationshipTypeDAO.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.generic.server.dataaccess;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.RelationshipTypePE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IRoleAssignmentDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IRoleAssignmentDAO.java
index 323c01c3a92..4e372b941e3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IRoleAssignmentDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IRoleAssignmentDAO.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.generic.server.dataaccess;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/ISampleDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/ISampleDAO.java
index a7a4f1ec211..c6e41a6562b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/ISampleDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/ISampleDAO.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.generic.server.dataaccess;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/ISampleTypeDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/ISampleTypeDAO.java
index af51e5e125f..b34125266c9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/ISampleTypeDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/ISampleTypeDAO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.server.dataaccess;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IScriptDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IScriptDAO.java
index ba0f24eab82..39d2bcf8e34 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IScriptDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IScriptDAO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.server.dataaccess;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/ISemanticAnnotationDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/ISemanticAnnotationDAO.java
index 31d99514fda..ed3e8deddd9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/ISemanticAnnotationDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/ISemanticAnnotationDAO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.server.dataaccess;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/ISpaceDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/ISpaceDAO.java
index dc684bc1b01..91a7ff7afef 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/ISpaceDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/ISpaceDAO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.server.dataaccess;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IVocabularyDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IVocabularyDAO.java
index 0e580887d17..8d53e079a98 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IVocabularyDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IVocabularyDAO.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.generic.server.dataaccess;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IVocabularyTermDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IVocabularyTermDAO.java
index 2a3f48aaf5e..9079d48b874 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IVocabularyTermDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IVocabularyTermDAO.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.openbis.generic.server.dataaccess;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PersistencyResources.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PersistencyResources.java
index 2eb639f2b8e..db691584338 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PersistencyResources.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PersistencyResources.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.generic.server.dataaccess;
 
 import org.hibernate.SessionFactory;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PlaceholderPropertyCreator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PlaceholderPropertyCreator.java
index b17997ff1f8..e650b70b73e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PlaceholderPropertyCreator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PlaceholderPropertyCreator.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.generic.server.dataaccess;
 
 import java.util.Set;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PropertyValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PropertyValidator.java
index 1e372784bd8..387d128500e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PropertyValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PropertyValidator.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.generic.server.dataaccess;
 
 import java.util.EnumMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/RelatedEntityFinder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/RelatedEntityFinder.java
index 94a8a4e0759..0e4dd314eb5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/RelatedEntityFinder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/RelatedEntityFinder.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.generic.server.dataaccess;
 
 import org.hibernate.Session;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/RelationshipUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/RelationshipUtils.java
index b325ab2b16d..b447dd26f0f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/RelationshipUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/RelationshipUtils.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.generic.server.dataaccess;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractDAO.java
index 5ff479960d1..15243eab064 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractDAO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.server.dataaccess.db;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractGenericEntityDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractGenericEntityDAO.java
index 7841c8cb5af..91fdcaa7222 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractGenericEntityDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractGenericEntityDAO.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.generic.server.dataaccess.db;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractGenericEntityWithPropertiesDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractGenericEntityWithPropertiesDAO.java
index 423055374a6..c0fff9cc075 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractGenericEntityWithPropertiesDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractGenericEntityWithPropertiesDAO.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.openbis.generic.server.dataaccess.db;
 
 import java.util.Collections;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractTypeDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractTypeDAO.java
index 403d033b6c7..0ff856a255e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractTypeDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractTypeDAO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.server.dataaccess.db;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AttachmentDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AttachmentDAO.java
index 7a8ac75f418..87c2e18f58c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AttachmentDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AttachmentDAO.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.generic.server.dataaccess.db;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AuthorizationDAOFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AuthorizationDAOFactory.java
index 4334d76f882..01038fbeffd 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AuthorizationDAOFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AuthorizationDAOFactory.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.generic.server.dataaccess.db;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.ISampleRelationshipDAO;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AuthorizationGroupDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AuthorizationGroupDAO.java
index 9df659546bf..d471ed213c8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AuthorizationGroupDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AuthorizationGroupDAO.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.generic.server.dataaccess.db;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/CodeSequenceDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/CodeSequenceDAO.java
index 116fcb16335..1fd3da27955 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/CodeSequenceDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/CodeSequenceDAO.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.generic.server.dataaccess.db;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/CorePluginDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/CorePluginDAO.java
index f649f2ae33e..66ba4e37f23 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/CorePluginDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/CorePluginDAO.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.openbis.generic.server.dataaccess.db;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOFactory.java
index 7fdd6b0fdc3..d6037a1842a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOFactory.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.generic.server.dataaccess.db;
 
 import java.sql.Connection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOUtils.java
index 85827f8ad0b..844bb294f73 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOUtils.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.generic.server.dataaccess.db;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataDAO.java
index c0030f12e56..d5b53808aa8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataDAO.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.generic.server.dataaccess.db;
 
 import java.math.BigInteger;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataSetTypeDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataSetTypeDAO.java
index 8bd1f01ad66..2b56e648dc0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataSetTypeDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataSetTypeDAO.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.generic.server.dataaccess.db;
 
 import org.hibernate.SessionFactory;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataStoreDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataStoreDAO.java
index b454425e7e0..be8e80be680 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataStoreDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataStoreDAO.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.generic.server.dataaccess.db;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DatabaseAndIndexReplacer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DatabaseAndIndexReplacer.java
index 6c2ae1fbb83..1f098835ffb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DatabaseAndIndexReplacer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DatabaseAndIndexReplacer.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.generic.server.dataaccess.db;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DatabaseVersionHolder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DatabaseVersionHolder.java
index a2adba47996..6ec9c34233f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DatabaseVersionHolder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DatabaseVersionHolder.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.generic.server.dataaccess.db;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DeletionDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DeletionDAO.java
index 997e9248e79..315cfba1616 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DeletionDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DeletionDAO.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.openbis.generic.server.dataaccess.db;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DynamicPropertiesInterceptor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DynamicPropertiesInterceptor.java
index 23da105116d..aca2b408a09 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DynamicPropertiesInterceptor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DynamicPropertiesInterceptor.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.generic.server.dataaccess.db;
 
 import org.hibernate.EmptyInterceptor;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityHistoryDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityHistoryDAO.java
index 8f645435e26..175734d271b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityHistoryDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityHistoryDAO.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.generic.server.dataaccess.db;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityOperationsLogDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityOperationsLogDAO.java
index 45f5ed496ea..9a901a39cf7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityOperationsLogDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityOperationsLogDAO.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.openbis.generic.server.dataaccess.db;
 
 import org.apache.log4j.Logger;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAO.java
index 48163b77c10..9051a4a7af9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.server.dataaccess.db;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityResolverQueryFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityResolverQueryFactory.java
index 38143b83e3d..423de1fa6a1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityResolverQueryFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityResolverQueryFactory.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.generic.server.dataaccess.db;
 
 import net.lemnik.eodsql.QueryTool;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityTypeDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityTypeDAO.java
index 234ee630605..179fbec8b09 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityTypeDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityTypeDAO.java
@@ -1,11 +1,11 @@
 /*
- * 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.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.generic.server.dataaccess.db;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityValidationInterceptor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityValidationInterceptor.java
index 8aa6d7377eb..d7bf6ac844c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityValidationInterceptor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityValidationInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 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.generic.server.dataaccess.db;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EventDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EventDAO.java
index 443eea3c897..8c6bd97a3a9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EventDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EventDAO.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.generic.server.dataaccess.db;
 
 import ch.systemsx.cisd.common.logging.LogCategory;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EventsSearchDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EventsSearchDAO.java
index c791bd3f50b..33eb7aa0811 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EventsSearchDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EventsSearchDAO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * 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.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.generic.server.dataaccess.db;
 
 import ch.systemsx.cisd.common.logging.LogCategory;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExperimentDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExperimentDAO.java
index 5727ba25080..61febe64480 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExperimentDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExperimentDAO.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.generic.server.dataaccess.db;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExternalDataManagementSystemDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExternalDataManagementSystemDAO.java
index 9dc34d5a736..b3ac14a033b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExternalDataManagementSystemDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExternalDataManagementSystemDAO.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.generic.server.dataaccess.db;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/FileFormatTypeDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/FileFormatTypeDAO.java
index eac258ff991..936bab0fb70 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/FileFormatTypeDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/FileFormatTypeDAO.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.generic.server.dataaccess.db;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/GridCustomColumnDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/GridCustomColumnDAO.java
index 61d0e5be221..83fc53c9a3b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/GridCustomColumnDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/GridCustomColumnDAO.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.generic.server.dataaccess.db;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/GridCustomFilterDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/GridCustomFilterDAO.java
index 37214d35dd9..fd8ca31655b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/GridCustomFilterDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/GridCustomFilterDAO.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.generic.server.dataaccess.db;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAOV3Adaptor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAOV3Adaptor.java
index dea410393e3..770cad211f9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAOV3Adaptor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAOV3Adaptor.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.systemsx.cisd.openbis.generic.server.dataaccess.db;
 
 import static ch.ethz.sis.openbis.generic.server.asapi.v3.search.translator.GlobalSearchCriteriaTranslator.IDENTIFIER_ALIAS;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDataProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDataProvider.java
index 00c94c0bb6e..f2c39dab255 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDataProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDataProvider.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.generic.server.dataaccess.db;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ICodeSequenceDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ICodeSequenceDAO.java
index 19979ffe64c..544f85abd7d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ICodeSequenceDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ICodeSequenceDAO.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.generic.server.dataaccess.db;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/IDeletionQuery.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/IDeletionQuery.java
index e1228184a9d..444b37c7217 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/IDeletionQuery.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/IDeletionQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 ETH Zuerich, SIS
+ * 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.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.generic.server.dataaccess.db;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/IDetachedCriteriaFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/IDetachedCriteriaFactory.java
index 4113bd977ba..0919bfbedea 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/IDetachedCriteriaFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/IDetachedCriteriaFactory.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.generic.server.dataaccess.db;
 
 import org.hibernate.criterion.DetachedCriteria;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/IEntityResolverQuery.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/IEntityResolverQuery.java
index 54ed03cbe1e..df1043569e8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/IEntityResolverQuery.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/IEntityResolverQuery.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.generic.server.dataaccess.db;
 
 import net.lemnik.eodsql.BaseQuery;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/IPermIdDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/IPermIdDAO.java
index 96363f25a79..fb67f0f6f7c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/IPermIdDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/IPermIdDAO.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.generic.server.dataaccess.db;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/InQuery.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/InQuery.java
index 69538d9ab55..f14a803067a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/InQuery.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/InQuery.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.generic.server.dataaccess.db;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/InQueryScroller.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/InQueryScroller.java
index 6964f08b259..fa828aa0222 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/InQueryScroller.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/InQueryScroller.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.generic.server.dataaccess.db;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/IndexCreationUtil.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/IndexCreationUtil.java
index 44d317b5964..90b7b5525fd 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/IndexCreationUtil.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/IndexCreationUtil.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.generic.server.dataaccess.db;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/LocatorTypeDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/LocatorTypeDAO.java
index f6e27aa0bca..a5ffa521bba 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/LocatorTypeDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/LocatorTypeDAO.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.generic.server.dataaccess.db;
 
 import org.hibernate.SessionFactory;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/MaterialDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/MaterialDAO.java
index 31a1abdde34..0408b8c2833 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/MaterialDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/MaterialDAO.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.generic.server.dataaccess.db;
 
 import static ch.systemsx.cisd.openbis.generic.shared.dto.ValidationMessages.CODE_PATTERN_MESSAGE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/MetaprojectDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/MetaprojectDAO.java
index dd91cb2f4f4..0918518bc71 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/MetaprojectDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/MetaprojectDAO.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.generic.server.dataaccess.db;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/MetaprojectSearch.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/MetaprojectSearch.java
index 01dd3dcdfda..a9a3ba9c489 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/MetaprojectSearch.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/MetaprojectSearch.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.generic.server.dataaccess.db;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.MetaprojectIdentifier;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/OpenBISHibernateTransactionManager.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/OpenBISHibernateTransactionManager.java
index 841cbf104ea..1d45d1693c4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/OpenBISHibernateTransactionManager.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/OpenBISHibernateTransactionManager.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.generic.server.dataaccess.db;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/OperationExecutionDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/OperationExecutionDAO.java
index eb93a5896ef..7add854b791 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/OperationExecutionDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/OperationExecutionDAO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.server.dataaccess.db;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PermIdDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PermIdDAO.java
index cc94c976a13..e7a06dad690 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PermIdDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PermIdDAO.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.generic.server.dataaccess.db;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonDAO.java
index 92996636659..4c19ab6ede8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonDAO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.server.dataaccess.db;
 
 import java.math.BigInteger;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonalAccessTokenDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonalAccessTokenDAO.java
index 71e00b25628..b54afb4d6f1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonalAccessTokenDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonalAccessTokenDAO.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.generic.server.dataaccess.db;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PostRegistrationDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PostRegistrationDAO.java
index d9b813be1cc..d65d8cb0e75 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PostRegistrationDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PostRegistrationDAO.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.openbis.generic.server.dataaccess.db;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ProjectDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ProjectDAO.java
index 6fe74770ace..f5662dca5d5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ProjectDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ProjectDAO.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.generic.server.dataaccess.db;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PropertyTypeDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PropertyTypeDAO.java
index b24f6f4b271..5e996935cd8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PropertyTypeDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PropertyTypeDAO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.server.dataaccess.db;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/QueryDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/QueryDAO.java
index d2ce0ac4420..e3fdbc21f6f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/QueryDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/QueryDAO.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.openbis.generic.server.dataaccess.db;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/RelationshipTypeDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/RelationshipTypeDAO.java
index 65b32059c12..12c037aa1a7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/RelationshipTypeDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/RelationshipTypeDAO.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.generic.server.dataaccess.db;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/RoleAssignmentDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/RoleAssignmentDAO.java
index 9e421a97e68..7c84e8ba840 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/RoleAssignmentDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/RoleAssignmentDAO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.server.dataaccess.db;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleDAO.java
index c2bf92929df..8e2ba3695c6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleDAO.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.generic.server.dataaccess.db;
 
 import java.math.BigInteger;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleDataAccessExceptionTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleDataAccessExceptionTranslator.java
index a0b67114d41..d74dc0cf3a0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleDataAccessExceptionTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleDataAccessExceptionTranslator.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.generic.server.dataaccess.db;
 
 import java.sql.SQLException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleRelationshipDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleRelationshipDAO.java
index b6732c6796f..acfa10fc417 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleRelationshipDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleRelationshipDAO.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2023 - 2023 Zürich, Scientific 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.generic.server.dataaccess.db;
 
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.deletion.EntityHistoryCreator;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleTypeDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleTypeDAO.java
index 96ba03251cf..eb5c18598f6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleTypeDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleTypeDAO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.server.dataaccess.db;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ScriptDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ScriptDAO.java
index b06a09d2f5e..e3f9983fadd 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ScriptDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ScriptDAO.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.openbis.generic.server.dataaccess.db;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SemanticAnnotationDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SemanticAnnotationDAO.java
index 5b78941850e..f2720819f9f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SemanticAnnotationDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SemanticAnnotationDAO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.server.dataaccess.db;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SequenceNameMapper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SequenceNameMapper.java
index b9ce58bf557..af89dad00c5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SequenceNameMapper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SequenceNameMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.server.dataaccess.db;
 
 import java.util.Collections;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SessionsUpdateInterceptor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SessionsUpdateInterceptor.java
index 63baaaeab5f..09338fe5d6a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SessionsUpdateInterceptor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SessionsUpdateInterceptor.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.generic.server.dataaccess.db;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SpaceDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SpaceDAO.java
index 158ff47d431..42c4e52a5d6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SpaceDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SpaceDAO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.server.dataaccess.db;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/VocabularyDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/VocabularyDAO.java
index 904ecd590f2..3b75abd0e78 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/VocabularyDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/VocabularyDAO.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.generic.server.dataaccess.db;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/VocabularyTermDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/VocabularyTermDAO.java
index f96434146a9..ddc52622bd5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/VocabularyTermDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/VocabularyTermDAO.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.generic.server.dataaccess.db;
 
 import org.apache.log4j.Logger;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/deletion/AttachmentEntry.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/deletion/AttachmentEntry.java
index 4b76b8cc8fa..b673fb93b33 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/deletion/AttachmentEntry.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/deletion/AttachmentEntry.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.systemsx.cisd.openbis.generic.server.dataaccess.db.deletion;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/deletion/AttributeEntry.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/deletion/AttributeEntry.java
index 3d65dc72722..7e0e45a6adf 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/deletion/AttributeEntry.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/deletion/AttributeEntry.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.systemsx.cisd.openbis.generic.server.dataaccess.db.deletion;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/deletion/EntityHistoryCreator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/deletion/EntityHistoryCreator.java
index b8c30f68783..efb7551e30f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/deletion/EntityHistoryCreator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/deletion/EntityHistoryCreator.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.systemsx.cisd.openbis.generic.server.dataaccess.db.deletion;
 
 import java.math.BigInteger;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/deletion/EntityModification.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/deletion/EntityModification.java
index b3f457e439f..b7c0795a1bd 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/deletion/EntityModification.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/deletion/EntityModification.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.systemsx.cisd.openbis.generic.server.dataaccess.db.deletion;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/deletion/PropertyHistoryEntry.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/deletion/PropertyHistoryEntry.java
index 189de5d88a5..1c92571f630 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/deletion/PropertyHistoryEntry.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/deletion/PropertyHistoryEntry.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.systemsx.cisd.openbis.generic.server.dataaccess.db.deletion;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/deletion/RelationshipHistoryEntry.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/deletion/RelationshipHistoryEntry.java
index 3f3b1438240..ae5112f513d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/deletion/RelationshipHistoryEntry.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/deletion/RelationshipHistoryEntry.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.systemsx.cisd.openbis.generic.server.dataaccess.db.deletion;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/exception/SampleUniqueCodeViolationException.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/exception/SampleUniqueCodeViolationException.java
index c809608aa72..195d942698b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/exception/SampleUniqueCodeViolationException.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/exception/SampleUniqueCodeViolationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.generic.server.dataaccess.db.exception;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/exception/SampleUniqueCodeViolationExceptionAbstract.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/exception/SampleUniqueCodeViolationExceptionAbstract.java
index 92233563352..47ee3213a3a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/exception/SampleUniqueCodeViolationExceptionAbstract.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/exception/SampleUniqueCodeViolationExceptionAbstract.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.generic.server.dataaccess.db.exception;
 
 import org.springframework.dao.DataIntegrityViolationException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/exception/SampleUniqueSubcodeViolationException.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/exception/SampleUniqueSubcodeViolationException.java
index 5adb81df70e..f5585c41682 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/exception/SampleUniqueSubcodeViolationException.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/exception/SampleUniqueSubcodeViolationException.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.generic.server.dataaccess.db.exception;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/DefaultBatchDynamicPropertyEvaluator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/DefaultBatchDynamicPropertyEvaluator.java
index 319149c3065..cae5247db3f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/DefaultBatchDynamicPropertyEvaluator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/DefaultBatchDynamicPropertyEvaluator.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.generic.server.dataaccess.dynamic_property;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/DynamicPropertyEvaluationRunnable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/DynamicPropertyEvaluationRunnable.java
index c39aceead81..401b736368d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/DynamicPropertyEvaluationRunnable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/DynamicPropertyEvaluationRunnable.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.generic.server.dataaccess.dynamic_property;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/DynamicPropertyEvaluator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/DynamicPropertyEvaluator.java
index 441d72b50be..46f9f1851f1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/DynamicPropertyEvaluator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/DynamicPropertyEvaluator.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.generic.server.dataaccess.dynamic_property;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/IBatchDynamicPropertyEvaluator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/IBatchDynamicPropertyEvaluator.java
index f4d5d37123e..5de3efddadf 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/IBatchDynamicPropertyEvaluator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/IBatchDynamicPropertyEvaluator.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.generic.server.dataaccess.dynamic_property;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/IDynamicPropertyCalculatorFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/IDynamicPropertyCalculatorFactory.java
index 9409c06a74b..1e0962b042e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/IDynamicPropertyCalculatorFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/IDynamicPropertyCalculatorFactory.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.generic.server.dataaccess.dynamic_property;
 
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.dynamic_property.calculator.api.IDynamicPropertyCalculator;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/IDynamicPropertyEvaluator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/IDynamicPropertyEvaluator.java
index 4ecde64178c..f39a636584d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/IDynamicPropertyEvaluator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/IDynamicPropertyEvaluator.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.generic.server.dataaccess.dynamic_property;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/AbstractEntityAdaptor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/AbstractEntityAdaptor.java
index fc0e2f3861a..18486499e66 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/AbstractEntityAdaptor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/AbstractEntityAdaptor.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.generic.server.dataaccess.dynamic_property.calculator;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/BasicPropertyAdaptor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/BasicPropertyAdaptor.java
index 95956fa448d..049840025d3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/BasicPropertyAdaptor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/BasicPropertyAdaptor.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.generic.server.dataaccess.dynamic_property.calculator;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.EntityPropertyPE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/DynamicPropertyAdaptor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/DynamicPropertyAdaptor.java
index d2c0d8262ed..bf283c58b8b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/DynamicPropertyAdaptor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/DynamicPropertyAdaptor.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.generic.server.dataaccess.dynamic_property.calculator;
 
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.dynamic_property.DynamicPropertyEvaluator;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/DynamicPropertyCalculatorFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/DynamicPropertyCalculatorFactory.java
index e24117611c9..8ef5f28e51f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/DynamicPropertyCalculatorFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/DynamicPropertyCalculatorFactory.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.generic.server.dataaccess.dynamic_property.calculator;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/DynamicPropertyFunctions.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/DynamicPropertyFunctions.java
index 2456b03c5cf..24953246c94 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/DynamicPropertyFunctions.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/DynamicPropertyFunctions.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.generic.server.dataaccess.dynamic_property.calculator;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.MaterialIdentifier;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/EntityAdaptorFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/EntityAdaptorFactory.java
index c537b1e813c..fb5893ef10e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/EntityAdaptorFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/EntityAdaptorFactory.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.generic.server.dataaccess.dynamic_property.calculator;
 
 import org.hibernate.Session;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/EntityAdaptorIterator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/EntityAdaptorIterator.java
index da660755ec5..616ab1360e2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/EntityAdaptorIterator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/EntityAdaptorIterator.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.generic.server.dataaccess.dynamic_property.calculator;
 
 import org.hibernate.ScrollableResults;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/EntityAdaptorRelationsLoader.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/EntityAdaptorRelationsLoader.java
index 39dd0d0fea6..d21baf3cdae 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/EntityAdaptorRelationsLoader.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/EntityAdaptorRelationsLoader.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.generic.server.dataaccess.dynamic_property.calculator;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/EntityTypeRecord.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/EntityTypeRecord.java
index 7c519529ea1..2648dd4a930 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/EntityTypeRecord.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/EntityTypeRecord.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.generic.server.dataaccess.dynamic_property.calculator;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/ExperimentAdaptor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/ExperimentAdaptor.java
index 83e3b9676da..9d8b272bdcb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/ExperimentAdaptor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/ExperimentAdaptor.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.generic.server.dataaccess.dynamic_property.calculator;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions.DataSetFetchOptions;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/ExternalDataAdaptor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/ExternalDataAdaptor.java
index d2101187a40..cd0bc5e12b0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/ExternalDataAdaptor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/ExternalDataAdaptor.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.generic.server.dataaccess.dynamic_property.calculator;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/ExternalDataAdaptorRelationsLoader.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/ExternalDataAdaptorRelationsLoader.java
index cf3ea07d673..2e65afff799 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/ExternalDataAdaptorRelationsLoader.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/ExternalDataAdaptorRelationsLoader.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.generic.server.dataaccess.dynamic_property.calculator;
 
 import it.unimi.dsi.fastutil.longs.LongSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/IExternalDataAdaptorRelationsQuery.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/IExternalDataAdaptorRelationsQuery.java
index 0fc28a9e511..99981c84cc3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/IExternalDataAdaptorRelationsQuery.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/IExternalDataAdaptorRelationsQuery.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.generic.server.dataaccess.dynamic_property.calculator;
 
 import it.unimi.dsi.fastutil.longs.LongSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/INonAbstractEntityAdapter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/INonAbstractEntityAdapter.java
index fe073e53b38..64a0672b0ee 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/INonAbstractEntityAdapter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/INonAbstractEntityAdapter.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.generic.server.dataaccess.dynamic_property.calculator;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.IEntityInformationWithPropertiesHolder;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/ISampleAdaptorRelationsQuery.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/ISampleAdaptorRelationsQuery.java
index e098f5fc6bc..b39906d0ded 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/ISampleAdaptorRelationsQuery.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/ISampleAdaptorRelationsQuery.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.generic.server.dataaccess.dynamic_property.calculator;
 
 import it.unimi.dsi.fastutil.longs.LongSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/JythonDynamicPropertyCalculator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/JythonDynamicPropertyCalculator.java
index cbec98f6b9b..a31dfd0c978 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/JythonDynamicPropertyCalculator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/JythonDynamicPropertyCalculator.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.generic.server.dataaccess.dynamic_property.calculator;
 
 import ch.systemsx.cisd.common.jython.evaluator.Evaluator;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/JythonEntityValidationCalculator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/JythonEntityValidationCalculator.java
index 50f695f73de..859de73d95d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/JythonEntityValidationCalculator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/JythonEntityValidationCalculator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.generic.server.dataaccess.dynamic_property.calculator;
 
 import ch.systemsx.cisd.common.jython.evaluator.EvaluatorException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/MaterialAdaptor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/MaterialAdaptor.java
index 7516d94fc80..d621cbd9917 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/MaterialAdaptor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/MaterialAdaptor.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.generic.server.dataaccess.dynamic_property.calculator;
 
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.dynamic_property.IDynamicPropertyEvaluator;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/SampleAdaptor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/SampleAdaptor.java
index 846b9dc53d8..85947e0d477 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/SampleAdaptor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/SampleAdaptor.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.generic.server.dataaccess.dynamic_property.calculator;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions.DataSetFetchOptions;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/SampleAdaptorRelationsLoader.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/SampleAdaptorRelationsLoader.java
index 6723dbc97d9..9ee62c06385 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/SampleAdaptorRelationsLoader.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/SampleAdaptorRelationsLoader.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.generic.server.dataaccess.dynamic_property.calculator;
 
 import it.unimi.dsi.fastutil.longs.LongSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/ScrollableResultsIterator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/ScrollableResultsIterator.java
index 7d7d74fca99..c8a8fe026eb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/ScrollableResultsIterator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/ScrollableResultsIterator.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.generic.server.dataaccess.dynamic_property.calculator;
 
 import java.util.Iterator;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/XmlPropertyAdaptor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/XmlPropertyAdaptor.java
index fb81cf717b0..3dfbb3b4295 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/XmlPropertyAdaptor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/XmlPropertyAdaptor.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.generic.server.dataaccess.dynamic_property.calculator;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.EntityPropertyPE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/api/IDataAdaptor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/api/IDataAdaptor.java
index 9e3a49bbb47..b6b453cc450 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/api/IDataAdaptor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/api/IDataAdaptor.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.generic.server.dataaccess.dynamic_property.calculator.api;
 
 import ch.systemsx.cisd.openbis.generic.shared.hotdeploy_plugins.api.IEntityAdaptor;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/api/IDynamicPropertyCalculator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/api/IDynamicPropertyCalculator.java
index d8d360ef9ab..f2dc67c5d3a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/api/IDynamicPropertyCalculator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/api/IDynamicPropertyCalculator.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.generic.server.dataaccess.dynamic_property.calculator.api;
 
 import ch.systemsx.cisd.openbis.generic.shared.hotdeploy_plugins.api.IEntityAdaptor;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/api/IDynamicPropertyCalculatorHotDeployPlugin.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/api/IDynamicPropertyCalculatorHotDeployPlugin.java
index a14b99d3176..79959192aca 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/api/IDynamicPropertyCalculatorHotDeployPlugin.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/api/IDynamicPropertyCalculatorHotDeployPlugin.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.generic.server.dataaccess.dynamic_property.calculator.api;
 
 import ch.systemsx.cisd.openbis.generic.shared.hotdeploy_plugins.api.ICommonPropertyBasedHotDeployPlugin;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/api/IExperimentAdaptor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/api/IExperimentAdaptor.java
index efb62e4860a..4f011a57cd3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/api/IExperimentAdaptor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/api/IExperimentAdaptor.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.generic.server.dataaccess.dynamic_property.calculator.api;
 
 import ch.systemsx.cisd.openbis.generic.shared.hotdeploy_plugins.api.IEntityAdaptor;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/api/IMaterialAdaptor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/api/IMaterialAdaptor.java
index 3f37e630a73..2afea21ab7f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/api/IMaterialAdaptor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/api/IMaterialAdaptor.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.generic.server.dataaccess.dynamic_property.calculator.api;
 
 import ch.systemsx.cisd.openbis.generic.shared.hotdeploy_plugins.api.IEntityAdaptor;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/api/ISampleAdaptor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/api/ISampleAdaptor.java
index 0d1332c1436..f8d8412f715 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/api/ISampleAdaptor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/api/ISampleAdaptor.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.generic.server.dataaccess.dynamic_property.calculator.api;
 
 import ch.systemsx.cisd.openbis.generic.shared.hotdeploy_plugins.api.IEntityAdaptor;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/entity_validation/AbstractEntityValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/entity_validation/AbstractEntityValidator.java
index 426f5b98f20..5b8d94152ca 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/entity_validation/AbstractEntityValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/entity_validation/AbstractEntityValidator.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.generic.server.dataaccess.entity_validation;
 
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.dynamic_property.calculator.INonAbstractEntityAdapter;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/entity_validation/EntityValidatorFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/entity_validation/EntityValidatorFactory.java
index 1f90fcf7cd7..34bf4e942a8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/entity_validation/EntityValidatorFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/entity_validation/EntityValidatorFactory.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.generic.server.dataaccess.entity_validation;
 
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.dynamic_property.calculator.INonAbstractEntityAdapter;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/entity_validation/IEntityValidatorFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/entity_validation/IEntityValidatorFactory.java
index e1f64d7c97e..12db8df58da 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/entity_validation/IEntityValidatorFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/entity_validation/IEntityValidatorFactory.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.generic.server.dataaccess.entity_validation;
 
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.dynamic_property.calculator.INonAbstractEntityAdapter;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/entity_validation/IEntityValidatorHotDeployPlugin.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/entity_validation/IEntityValidatorHotDeployPlugin.java
index 362085f3832..59c48d9dbf7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/entity_validation/IEntityValidatorHotDeployPlugin.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/entity_validation/IEntityValidatorHotDeployPlugin.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.generic.server.dataaccess.entity_validation;
 
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.entity_validation.api.IEntityValidator;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/entity_validation/JythonEntityValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/entity_validation/JythonEntityValidator.java
index 826fb41ab26..8dfe5445009 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/entity_validation/JythonEntityValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/entity_validation/JythonEntityValidator.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.generic.server.dataaccess.entity_validation;
 
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.dynamic_property.calculator.JythonEntityValidationCalculator;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/entity_validation/api/IEntityValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/entity_validation/api/IEntityValidator.java
index ac1526b5f5e..0352b29adb8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/entity_validation/api/IEntityValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/entity_validation/api/IEntityValidator.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.generic.server.dataaccess.entity_validation.api;
 
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.dynamic_property.calculator.INonAbstractEntityAdapter;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/event/DeleteDataSetEventBuilder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/event/DeleteDataSetEventBuilder.java
index b06ee47719f..442e64af7ea 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/event/DeleteDataSetEventBuilder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/event/DeleteDataSetEventBuilder.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.generic.server.dataaccess.event;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/event/DeleteDataSetEventParser.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/event/DeleteDataSetEventParser.java
index bbf57675719..86e30dfc8e1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/event/DeleteDataSetEventParser.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/event/DeleteDataSetEventParser.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.generic.server.dataaccess.event;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom022To023.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom022To023.java
index 373e6edbf52..4b3504cc537 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom022To023.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom022To023.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.generic.server.dataaccess.migration;
 
 import javax.sql.DataSource;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom023To024.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom023To024.java
index bd3b68f3445..8aed0953d05 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom023To024.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom023To024.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.generic.server.dataaccess.migration;
 
 import java.sql.ResultSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom025To026.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom025To026.java
index 21d76092a37..a2da7792642 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom025To026.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom025To026.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.generic.server.dataaccess.migration;
 
 import java.sql.ResultSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom036To037.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom036To037.java
index f1081aa354d..08d376fa204 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom036To037.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom036To037.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.generic.server.dataaccess.migration;
 
 import java.sql.ResultSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom046To047.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom046To047.java
index fb7762e49f6..ddb56cbfc9e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom046To047.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom046To047.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.generic.server.dataaccess.migration;
 
 import java.sql.ResultSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/util/KeyExtractorFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/util/KeyExtractorFactory.java
index 0c6560354eb..9f40999a1c1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/util/KeyExtractorFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/util/KeyExtractorFactory.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.generic.server.dataaccess.util;
 
 import ch.systemsx.cisd.common.collection.IKeyExtractor;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/util/UpdateUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/util/UpdateUtils.java
index 8822a47a9f6..5f4f6aa4e1e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/util/UpdateUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/util/UpdateUtils.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.generic.server.dataaccess.util;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/hotfix/ELNAnnotationsMigration.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/hotfix/ELNAnnotationsMigration.java
index 6ea360096b9..497cc6c2737 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/hotfix/ELNAnnotationsMigration.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/hotfix/ELNAnnotationsMigration.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.systemsx.cisd.openbis.generic.server.hotfix;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchResult;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/hotfix/ELNCollectionTypeMigration.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/hotfix/ELNCollectionTypeMigration.java
index bd5d0f53a0b..7efc5c2bb2a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/hotfix/ELNCollectionTypeMigration.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/hotfix/ELNCollectionTypeMigration.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.server.hotfix;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchResult;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/hotfix/ELNFixes.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/hotfix/ELNFixes.java
index 32f35fc7b3f..27fa661edfc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/hotfix/ELNFixes.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/hotfix/ELNFixes.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.systemsx.cisd.openbis.generic.server.hotfix;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchResult;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/DataType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/DataType.java
index cd445b63b0a..845fc046d41 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/DataType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/DataType.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.generic.server.jython.api.v1;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/EntityKind.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/EntityKind.java
index 75e947ae994..28f683bf706 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/EntityKind.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/EntityKind.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.generic.server.jython.api.v1;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IAbstractType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IAbstractType.java
index fec0d98c9ab..89d5c3e9c3a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IAbstractType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IAbstractType.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.generic.server.jython.api.v1;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IDataSetType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IDataSetType.java
index aa08937704d..5bfd28ee5d2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IDataSetType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IDataSetType.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.generic.server.jython.api.v1;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IDataSetTypeImmutable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IDataSetTypeImmutable.java
index daac5a02c67..f7ab1ef5f10 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IDataSetTypeImmutable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IDataSetTypeImmutable.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.generic.server.jython.api.v1;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IEntityType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IEntityType.java
index bcd3486e420..9505e70279b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IEntityType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IEntityType.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.generic.server.jython.api.v1;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IEntityTypeMutable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IEntityTypeMutable.java
index 5c17227352e..6f3131ec015 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IEntityTypeMutable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IEntityTypeMutable.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.generic.server.jython.api.v1;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.impl.ScriptImmutable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IExperimentType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IExperimentType.java
index c0090a338ab..5b6d48beed3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IExperimentType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IExperimentType.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.generic.server.jython.api.v1;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IExperimentTypeImmutable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IExperimentTypeImmutable.java
index 50a726e7dd8..4beac4fdd11 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IExperimentTypeImmutable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IExperimentTypeImmutable.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.generic.server.jython.api.v1;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IExternalDataManagementSystem.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IExternalDataManagementSystem.java
index 5e38ff42e2c..64d4acbaa7c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IExternalDataManagementSystem.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/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.openbis.generic.server.jython.api.v1;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalDataManagementSystemType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IExternalDataManagementSystemImmutable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IExternalDataManagementSystemImmutable.java
index 1562ecda1ae..02efdc9ad9f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IExternalDataManagementSystemImmutable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/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.generic.server.jython.api.v1;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalDataManagementSystemType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IFileFormatType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IFileFormatType.java
index 888150713ad..bcc3f05ba41 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IFileFormatType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IFileFormatType.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.generic.server.jython.api.v1;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IFileFormatTypeImmutable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IFileFormatTypeImmutable.java
index 47c493662da..96003481a70 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IFileFormatTypeImmutable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IFileFormatTypeImmutable.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.generic.server.jython.api.v1;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IMasterDataRegistrationService.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IMasterDataRegistrationService.java
index c406b5d407e..c860a54c0eb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IMasterDataRegistrationService.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IMasterDataRegistrationService.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.generic.server.jython.api.v1;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IMasterDataRegistrationTransaction.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IMasterDataRegistrationTransaction.java
index ecbe663e4ad..6390aabd1d7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IMasterDataRegistrationTransaction.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IMasterDataRegistrationTransaction.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.generic.server.jython.api.v1;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IMaterialType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IMaterialType.java
index cb8cdeecde9..ceeb1b29b06 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IMaterialType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IMaterialType.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.generic.server.jython.api.v1;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IMaterialTypeImmutable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IMaterialTypeImmutable.java
index f4193a5ffe1..e9f6b88e05d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IMaterialTypeImmutable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IMaterialTypeImmutable.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.generic.server.jython.api.v1;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IPropertyAssignment.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IPropertyAssignment.java
index e881d335d10..4aea94389ca 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IPropertyAssignment.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IPropertyAssignment.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.generic.server.jython.api.v1;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IPropertyAssignmentImmutable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IPropertyAssignmentImmutable.java
index 468f9401606..87387c0e6d2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IPropertyAssignmentImmutable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IPropertyAssignmentImmutable.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.generic.server.jython.api.v1;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IPropertyType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IPropertyType.java
index 6939b15c884..e6351dcc83c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IPropertyType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IPropertyType.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.generic.server.jython.api.v1;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IPropertyTypeImmutable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IPropertyTypeImmutable.java
index 5fe5d099f71..953e18535f8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IPropertyTypeImmutable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IPropertyTypeImmutable.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.generic.server.jython.api.v1;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/ISampleType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/ISampleType.java
index f545bf5fc8e..3cf47f20774 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/ISampleType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/ISampleType.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.generic.server.jython.api.v1;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/ISampleTypeImmutable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/ISampleTypeImmutable.java
index 04a7abe8c25..aabd0996037 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/ISampleTypeImmutable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/ISampleTypeImmutable.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.generic.server.jython.api.v1;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IScript.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IScript.java
index 1bc91bc2698..ee9f09904bb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IScript.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IScript.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.generic.server.jython.api.v1;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IScriptImmutable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IScriptImmutable.java
index f1513aa8f51..99d91f5913c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IScriptImmutable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IScriptImmutable.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.generic.server.jython.api.v1;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IVocabulary.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IVocabulary.java
index 09a9b0eb2c1..72a0ec3db1b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IVocabulary.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IVocabulary.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.generic.server.jython.api.v1;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IVocabularyImmutable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IVocabularyImmutable.java
index d72f1951e85..41deaa73963 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IVocabularyImmutable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IVocabularyImmutable.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.generic.server.jython.api.v1;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IVocabularyTerm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IVocabularyTerm.java
index e57fdb5e522..a30c0276294 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IVocabularyTerm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IVocabularyTerm.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.generic.server.jython.api.v1;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IVocabularyTermImmutable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IVocabularyTermImmutable.java
index 5cf84d0f19d..201b2dfc362 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IVocabularyTermImmutable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/IVocabularyTermImmutable.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.generic.server.jython.api.v1;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/DataSetType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/DataSetType.java
index de42df3fd64..1402974e1d6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/DataSetType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/DataSetType.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.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IDataSetType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/DataSetTypeImmutable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/DataSetTypeImmutable.java
index 8462e3b905c..2300938b396 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/DataSetTypeImmutable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/DataSetTypeImmutable.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.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.EntityKind;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/DataSetTypeWrapper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/DataSetTypeWrapper.java
index 7d2c6cf1961..bc8840d4720 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/DataSetTypeWrapper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/DataSetTypeWrapper.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.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IDataSetType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/EncapsulatedCommonServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/EncapsulatedCommonServer.java
index 1eb93e16714..ac5a44191f5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/EncapsulatedCommonServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/EncapsulatedCommonServer.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.generic.server.jython.api.v1.impl;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ExperimentType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ExperimentType.java
index 0e4e24b0a40..d28a7869e83 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ExperimentType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ExperimentType.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.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IExperimentType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ExperimentTypeImmutable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ExperimentTypeImmutable.java
index 7d94caed4d2..f279abb887b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ExperimentTypeImmutable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ExperimentTypeImmutable.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.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.EntityKind;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ExperimentTypeWrapper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ExperimentTypeWrapper.java
index 46e7f4c8b95..66b069cb5f5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ExperimentTypeWrapper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ExperimentTypeWrapper.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.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IExperimentType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ExternalDataManagementSystem.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ExternalDataManagementSystem.java
index dccf3755f71..4979afdecb2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ExternalDataManagementSystem.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ExternalDataManagementSystem.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.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IExternalDataManagementSystem;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ExternalDataManagementSystemImmutable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ExternalDataManagementSystemImmutable.java
index 7c35725bbd8..d65ac9b3110 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ExternalDataManagementSystemImmutable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ExternalDataManagementSystemImmutable.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.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IExternalDataManagementSystemImmutable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ExternalDataManagementSystemWrapper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ExternalDataManagementSystemWrapper.java
index 9e9061b33fc..6a7d01f0dde 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ExternalDataManagementSystemWrapper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ExternalDataManagementSystemWrapper.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.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IExternalDataManagementSystem;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/FileFormatType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/FileFormatType.java
index 176515eaa78..3ed469e5667 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/FileFormatType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/FileFormatType.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.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IFileFormatType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/FileFormatTypeImmutable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/FileFormatTypeImmutable.java
index af7a5a01334..31b0aa6bc4a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/FileFormatTypeImmutable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/FileFormatTypeImmutable.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.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IFileFormatTypeImmutable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/FileFormatTypeWrapper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/FileFormatTypeWrapper.java
index ee72eae2633..b0319dc91f8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/FileFormatTypeWrapper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/FileFormatTypeWrapper.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.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IFileFormatType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/IMasterDataScriptRegistrationRunner.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/IMasterDataScriptRegistrationRunner.java
index 797e5082e0c..0847521609f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/IMasterDataScriptRegistrationRunner.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/IMasterDataScriptRegistrationRunner.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.generic.server.jython.api.v1.impl;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationException.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationException.java
index 9d5501c7b5d..11d341ba435 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationException.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationException.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.generic.server.jython.api.v1.impl;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationHelper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationHelper.java
index 31ed584c3b4..aa023a84384 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationHelper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationHelper.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.generic.server.jython.api.v1.impl;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationScriptRunner.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationScriptRunner.java
index c6ff065227b..d1b141a0b1b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationScriptRunner.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationScriptRunner.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.generic.server.jython.api.v1.impl;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationScriptRunnerStandalone.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationScriptRunnerStandalone.java
index ab7cc01004c..1566eb0ca7d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationScriptRunnerStandalone.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationScriptRunnerStandalone.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.generic.server.jython.api.v1.impl;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationService.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationService.java
index 573a6506428..3226c7d7b46 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationService.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationService.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.generic.server.jython.api.v1.impl;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationTransaction.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationTransaction.java
index a31226fd333..86d814be83c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationTransaction.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationTransaction.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.generic.server.jython.api.v1.impl;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataTransactionErrors.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataTransactionErrors.java
index 7bd9ff8832d..c4c80996f7d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataTransactionErrors.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataTransactionErrors.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.generic.server.jython.api.v1.impl;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MaterialType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MaterialType.java
index 532291bd6ab..730970ba267 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MaterialType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MaterialType.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.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IMaterialType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MaterialTypeImmutable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MaterialTypeImmutable.java
index 4a9767901f1..176e8004dac 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MaterialTypeImmutable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MaterialTypeImmutable.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.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.EntityKind;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MaterialTypeWrapper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MaterialTypeWrapper.java
index 1c74a7734fa..f825f425475 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MaterialTypeWrapper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MaterialTypeWrapper.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.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IMaterialType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/PropertyAssignment.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/PropertyAssignment.java
index cad026f1015..27c60347bee 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/PropertyAssignment.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/PropertyAssignment.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.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IPropertyAssignment;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/PropertyAssignmentImmutable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/PropertyAssignmentImmutable.java
index 2db1ad933aa..0e17896c6db 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/PropertyAssignmentImmutable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/PropertyAssignmentImmutable.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.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.EntityKind;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/PropertyAssignmentWrapper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/PropertyAssignmentWrapper.java
index 522e43ddca9..a5892be7abe 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/PropertyAssignmentWrapper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/PropertyAssignmentWrapper.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.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IPropertyAssignment;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/PropertyType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/PropertyType.java
index 133e58883d3..c5b263c3228 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/PropertyType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/PropertyType.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.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.common.shared.basic.string.StringUtils;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/PropertyTypeImmutable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/PropertyTypeImmutable.java
index e23f48bba8c..31db10ac7bb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/PropertyTypeImmutable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/PropertyTypeImmutable.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.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.DataType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/PropertyTypeWrapper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/PropertyTypeWrapper.java
index 10e33d2c962..26417b0284b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/PropertyTypeWrapper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/PropertyTypeWrapper.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.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IMaterialTypeImmutable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/SampleType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/SampleType.java
index a01a17549b8..3b9853ed73f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/SampleType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/SampleType.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.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.ISampleType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/SampleTypeImmutable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/SampleTypeImmutable.java
index a86c0d40cfe..91a305869fb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/SampleTypeImmutable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/SampleTypeImmutable.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.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.EntityKind;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/SampleTypeWrapper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/SampleTypeWrapper.java
index edc7fe2284f..8305ec737de 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/SampleTypeWrapper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/SampleTypeWrapper.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.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.ISampleType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/Script.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/Script.java
index 2604ae60d18..c3c39c989a5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/Script.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/Script.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.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IScript;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ScriptHelper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ScriptHelper.java
index 3c8de5fffd8..949187e32ec 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ScriptHelper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ScriptHelper.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.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IScriptImmutable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ScriptImmutable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ScriptImmutable.java
index b9fadcff043..222e82933b4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ScriptImmutable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ScriptImmutable.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.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IScriptImmutable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ScriptWrapper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ScriptWrapper.java
index f4cb8cfb2c9..78b655718bb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ScriptWrapper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/ScriptWrapper.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.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IScript;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/Vocabulary.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/Vocabulary.java
index d609bee8ea3..29eb600cc43 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/Vocabulary.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/Vocabulary.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.generic.server.jython.api.v1.impl;
 
 import java.util.Collections;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/VocabularyImmutable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/VocabularyImmutable.java
index da167fe55eb..bb6d14d581b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/VocabularyImmutable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/VocabularyImmutable.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.generic.server.jython.api.v1.impl;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/VocabularyTerm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/VocabularyTerm.java
index 72df78a1fc7..4be5aadcd4f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/VocabularyTerm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/VocabularyTerm.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.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IVocabularyTerm;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/VocabularyTermImmutable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/VocabularyTermImmutable.java
index 1fff156a60a..a2c25298107 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/VocabularyTermImmutable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/VocabularyTermImmutable.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.generic.server.jython.api.v1.impl;
 
 import ch.systemsx.cisd.openbis.generic.server.jython.api.v1.IVocabularyTermImmutable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/VocabularyWrapper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/VocabularyWrapper.java
index 7bc2c8ed5b3..662857f16dd 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/VocabularyWrapper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/VocabularyWrapper.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.generic.server.jython.api.v1.impl;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/pat/PersonalAccessTokenConfigFromProperties.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/pat/PersonalAccessTokenConfigFromProperties.java
index f4502bf414f..bf1d7e9b903 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/pat/PersonalAccessTokenConfigFromProperties.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/pat/PersonalAccessTokenConfigFromProperties.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.generic.server.pat;
 
 import javax.annotation.Resource;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/pat/PersonalAccessTokenConverterFromDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/pat/PersonalAccessTokenConverterFromDAO.java
index 470eaccba98..9995dcb2cab 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/pat/PersonalAccessTokenConverterFromDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/pat/PersonalAccessTokenConverterFromDAO.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.generic.server.pat;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/pat/PersonalAccessTokenOpenBisSessionManagerDecorator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/pat/PersonalAccessTokenOpenBisSessionManagerDecorator.java
index 74af2f8f2b0..84f0d2e41da 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/pat/PersonalAccessTokenOpenBisSessionManagerDecorator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/pat/PersonalAccessTokenOpenBisSessionManagerDecorator.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.generic.server.pat;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/pat/PersonalAccessTokenValidityWarningTask.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/pat/PersonalAccessTokenValidityWarningTask.java
index a01f6470e39..c5bf00cc9a1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/pat/PersonalAccessTokenValidityWarningTask.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/pat/PersonalAccessTokenValidityWarningTask.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.generic.server.pat;
 
 import static java.util.stream.Collectors.groupingBy;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/AbstractPluginRegistry.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/AbstractPluginRegistry.java
index 8515ff75a89..32e2d4aab62 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/AbstractPluginRegistry.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/AbstractPluginRegistry.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.generic.server.plugin;
 
 import org.apache.log4j.Logger;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/DataSetServerPluginRegistry.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/DataSetServerPluginRegistry.java
index f86a5968fcf..cbbf7d58434 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/DataSetServerPluginRegistry.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/DataSetServerPluginRegistry.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.generic.server.plugin;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IDataSetServerPlugin.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IDataSetServerPlugin.java
index dc11dffdc3b..bc3ff106079 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IDataSetServerPlugin.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IDataSetServerPlugin.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.generic.server.plugin;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IDataSetTypeSlaveServerPlugin.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IDataSetTypeSlaveServerPlugin.java
index 42017e86dd2..8c00d57c277 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IDataSetTypeSlaveServerPlugin.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IDataSetTypeSlaveServerPlugin.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.generic.server.plugin;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/ISampleServerPlugin.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/ISampleServerPlugin.java
index 9dc0da4a643..12285da1552 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/ISampleServerPlugin.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/ISampleServerPlugin.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.generic.server.plugin;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/ISampleTypeSlaveServerPlugin.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/ISampleTypeSlaveServerPlugin.java
index e0aa031fa29..bdca1428ff7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/ISampleTypeSlaveServerPlugin.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/ISampleTypeSlaveServerPlugin.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.generic.server.plugin;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IServerPlugin.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IServerPlugin.java
index 5a553de0e9f..5333af37f00 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IServerPlugin.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IServerPlugin.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.generic.server.plugin;
 
 import java.util.Set;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IServerPluginWithWildcards.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IServerPluginWithWildcards.java
index 017d7969262..7fcaf42aa28 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IServerPluginWithWildcards.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IServerPluginWithWildcards.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.generic.server.plugin;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/SampleServerPluginRegistry.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/SampleServerPluginRegistry.java
index bbfab1bb9aa..ad30c555943 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/SampleServerPluginRegistry.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/SampleServerPluginRegistry.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.generic.server.plugin;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/WildcardSupportingPluginMap.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/WildcardSupportingPluginMap.java
index 6dd92412736..6be85881ff7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/WildcardSupportingPluginMap.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/WildcardSupportingPluginMap.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.generic.server.plugin;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.WildcardSupportingMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/AbstractGroupMaintenanceTask.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/AbstractGroupMaintenanceTask.java
index d53a077d26c..9c6863c0948 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/AbstractGroupMaintenanceTask.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/AbstractGroupMaintenanceTask.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.openbis.generic.server.task;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/ArchivingByRequestTask.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/ArchivingByRequestTask.java
index abc5f3b9eb3..04df8254736 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/ArchivingByRequestTask.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/ArchivingByRequestTask.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.openbis.generic.server.task;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/BatchSampleRegistrationTempCodeUpdaterTask.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/BatchSampleRegistrationTempCodeUpdaterTask.java
index 0e9bccdff5d..f1f1efb7400 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/BatchSampleRegistrationTempCodeUpdaterTask.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/BatchSampleRegistrationTempCodeUpdaterTask.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.generic.server.task;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/CacheClearanceMaintenanceTask.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/CacheClearanceMaintenanceTask.java
index 0815cbdd104..a0a30a5115f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/CacheClearanceMaintenanceTask.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/CacheClearanceMaintenanceTask.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.generic.server.task;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/DataSetRegistrationSummaryTask.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/DataSetRegistrationSummaryTask.java
index 7bcf78c7738..1fd8ea2d897 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/DataSetRegistrationSummaryTask.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/DataSetRegistrationSummaryTask.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.generic.server.task;
 
 import java.text.SimpleDateFormat;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/DemoMaintenanceTask.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/DemoMaintenanceTask.java
index 88436451f0d..2447582e3be 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/DemoMaintenanceTask.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/DemoMaintenanceTask.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.generic.server.task;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/DynamicPropertyEvaluationMaintenanceTask.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/DynamicPropertyEvaluationMaintenanceTask.java
index 89fdb68b904..5c0093e6e52 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/DynamicPropertyEvaluationMaintenanceTask.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/DynamicPropertyEvaluationMaintenanceTask.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.generic.server.task;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/DynamicPropertyEvaluationTriggeredByMaterialChangeMaintenanceTask.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/DynamicPropertyEvaluationTriggeredByMaterialChangeMaintenanceTask.java
index 08757c47059..577b81868d0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/DynamicPropertyEvaluationTriggeredByMaterialChangeMaintenanceTask.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/DynamicPropertyEvaluationTriggeredByMaterialChangeMaintenanceTask.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.generic.server.task;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/IChangedHandler.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/IChangedHandler.java
index 0604be75507..75cf3e93313 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/IChangedHandler.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/IChangedHandler.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.openbis.generic.server.task;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/MaintenanceTaskUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/MaintenanceTaskUtils.java
index c44da175a59..dbea54ff7e7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/MaintenanceTaskUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/MaintenanceTaskUtils.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.generic.server.task;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/MaterialExternalDBSyncTask.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/MaterialExternalDBSyncTask.java
index 6d2695273cc..d554c013c8e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/MaterialExternalDBSyncTask.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/MaterialExternalDBSyncTask.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.generic.server.task;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/MaterialsMigration.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/MaterialsMigration.java
index 834d663f53f..26a9dd5bf1e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/MaterialsMigration.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/MaterialsMigration.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.generic.server.task;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.IApplicationServerApi;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/Period.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/Period.java
index bcfad2c94a2..5c1f839491c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/Period.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/Period.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.openbis.generic.server.task;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/PeriodType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/PeriodType.java
index 611eb07bab6..927394289b9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/PeriodType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/PeriodType.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.openbis.generic.server.task;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/RemoveUnusedUnofficialTermsMaintenanceTask.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/RemoveUnusedUnofficialTermsMaintenanceTask.java
index 7ee9de30178..b45ec24b961 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/RemoveUnusedUnofficialTermsMaintenanceTask.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/RemoveUnusedUnofficialTermsMaintenanceTask.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.generic.server.task;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/RevokeUserAccessMaintenanceTask.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/RevokeUserAccessMaintenanceTask.java
index 0dae85353b6..26536508f82 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/RevokeUserAccessMaintenanceTask.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/RevokeUserAccessMaintenanceTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 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.generic.server.task;
 
 import java.text.DateFormat;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/SessionCleanUpMaintenanceTask.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/SessionCleanUpMaintenanceTask.java
index 49596055be6..b3152d11f6a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/SessionCleanUpMaintenanceTask.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/SessionCleanUpMaintenanceTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 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.generic.server.task;
 
 import java.util.Properties;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/SessionWorkspaceCleanUpMaintenanceTask.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/SessionWorkspaceCleanUpMaintenanceTask.java
index 61f78fbc6a3..499e8b729b2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/SessionWorkspaceCleanUpMaintenanceTask.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/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.systemsx.cisd.openbis.generic.server.task;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/StatisticsCollectionMaintenanceTask.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/StatisticsCollectionMaintenanceTask.java
index 1612d49d40a..97185684aef 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/StatisticsCollectionMaintenanceTask.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/StatisticsCollectionMaintenanceTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, CISD
+ * 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.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.generic.server.task;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchResult;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UsageAndGroupsInfo.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UsageAndGroupsInfo.java
index fe6565411ec..2b25d644063 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UsageAndGroupsInfo.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UsageAndGroupsInfo.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.openbis.generic.server.task;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UsageGatherer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UsageGatherer.java
index 33b4e40054b..8ee4dfa9099 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UsageGatherer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UsageGatherer.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.openbis.generic.server.task;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UsageInfo.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UsageInfo.java
index 965e9419900..7260aeb493a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UsageInfo.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UsageInfo.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.openbis.generic.server.task;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UsageReportingTask.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UsageReportingTask.java
index 35a6845ffc0..09f32920b05 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UsageReportingTask.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UsageReportingTask.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.openbis.generic.server.task;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UserGroup.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UserGroup.java
index 7ce32e2bcd6..63a6e819409 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UserGroup.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UserGroup.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.openbis.generic.server.task;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UserManagementMaintenanceTask.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UserManagementMaintenanceTask.java
index 17fa08bda1f..5f803c85350 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UserManagementMaintenanceTask.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UserManagementMaintenanceTask.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.openbis.generic.server.task;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UserManager.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UserManager.java
index 127a2712fe7..6da46d503ac 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UserManager.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UserManager.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.openbis.generic.server.task;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UserManagerConfig.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UserManagerConfig.java
index 725d56c5fd4..acfb0d05c28 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UserManagerConfig.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UserManagerConfig.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.openbis.generic.server.task;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UserManagerReport.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UserManagerReport.java
index db087aa10ac..cffd576cdbe 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UserManagerReport.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UserManagerReport.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.openbis.generic.server.task;
 
 import java.text.MessageFormat;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/AttachmentDeletionProcessor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/AttachmentDeletionProcessor.java
index ee8aad7f599..e58d3cb90b6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/AttachmentDeletionProcessor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/AttachmentDeletionProcessor.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.generic.server.task.events_search;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.EventPE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/DataSetDeletionProcessor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/DataSetDeletionProcessor.java
index 74345c320ff..5f3bf26cc81 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/DataSetDeletionProcessor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/DataSetDeletionProcessor.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.generic.server.task.events_search;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DeletedDataSetLocation;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/DataSource.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/DataSource.java
index a0961b77d57..efc553f342a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/DataSource.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/DataSource.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.generic.server.task.events_search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.Experiment;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/DeletionEventProcessor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/DeletionEventProcessor.java
index c08f8f86df4..efde813526c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/DeletionEventProcessor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/DeletionEventProcessor.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.generic.server.task.events_search;
 
 import java.text.SimpleDateFormat;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/EventProcessor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/EventProcessor.java
index 74badf50b98..978628cf034 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/EventProcessor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/EventProcessor.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.generic.server.task.events_search;
 
 abstract class EventProcessor
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/EventsSearchMaintenanceTask.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/EventsSearchMaintenanceTask.java
index 9880b00566c..1438863a15b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/EventsSearchMaintenanceTask.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/EventsSearchMaintenanceTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * 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.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.generic.server.task.events_search;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/ExperimentDeletionProcessor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/ExperimentDeletionProcessor.java
index 19456ba9947..c28cbcd5ffe 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/ExperimentDeletionProcessor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/ExperimentDeletionProcessor.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.generic.server.task.events_search;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.EventPE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/GenericEventProcessor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/GenericEventProcessor.java
index f0af1299242..37021bd753e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/GenericEventProcessor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/GenericEventProcessor.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.generic.server.task.events_search;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.EventPE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/IDataSource.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/IDataSource.java
index 2bb192ef762..0b23f22d1fa 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/IDataSource.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/IDataSource.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.generic.server.task.events_search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.Experiment;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/LastTimestamps.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/LastTimestamps.java
index 576c7d71671..6822bb6411b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/LastTimestamps.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/LastTimestamps.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.generic.server.task.events_search;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/NewEvent.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/NewEvent.java
index e46360f8103..bd5ce9a9399 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/NewEvent.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/NewEvent.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.generic.server.task.events_search;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.EventPE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/ProjectDeletionProcessor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/ProjectDeletionProcessor.java
index 1e1393e0a2f..50f1fe3f976 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/ProjectDeletionProcessor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/ProjectDeletionProcessor.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.generic.server.task.events_search;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.EventPE.EntityType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/SampleDeletionProcessor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/SampleDeletionProcessor.java
index e1b31772164..0ba0ecbd33c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/SampleDeletionProcessor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/SampleDeletionProcessor.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.generic.server.task.events_search;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.EventPE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/Snapshot.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/Snapshot.java
index 508a736e218..18142807818 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/Snapshot.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/Snapshot.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.generic.server.task.events_search;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/Snapshots.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/Snapshots.java
index b479020efe0..ace36fd4145 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/Snapshots.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/Snapshots.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.generic.server.task.events_search;
 
 import java.util.*;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/SnapshotsFacade.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/SnapshotsFacade.java
index 91bbdaaa683..b6ebbd96202 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/SnapshotsFacade.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/SnapshotsFacade.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.generic.server.task.events_search;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/SpaceDeletionProcessor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/SpaceDeletionProcessor.java
index 65b91a9c7e9..485c1576f9e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/SpaceDeletionProcessor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/SpaceDeletionProcessor.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.generic.server.task.events_search;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.EventPE.EntityType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/Statistics.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/Statistics.java
index 3348a428d41..8184d286336 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/Statistics.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/Statistics.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.generic.server.task.events_search;
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/util/LifeCycleListener.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/util/LifeCycleListener.java
index 6a1ab8115cd..9d8d11905b9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/util/LifeCycleListener.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/util/LifeCycleListener.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.generic.server.util;
 
 import org.eclipse.jetty.util.component.LifeCycle;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/util/MethodInvocationUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/util/MethodInvocationUtils.java
index 19542c1d692..26964ba5a7b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/util/MethodInvocationUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/util/MethodInvocationUtils.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.generic.server.util;
 
 import java.lang.annotation.Annotation;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/util/OpenbisWebAppProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/util/OpenbisWebAppProvider.java
index 56c3352dfa0..9af4fa2b878 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/util/OpenbisWebAppProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/util/OpenbisWebAppProvider.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.generic.server.util;
 
 import org.eclipse.jetty.deploy.App;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/util/PluginUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/util/PluginUtils.java
index d2128c4ecfe..8ca1be51f1c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/util/PluginUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/util/PluginUtils.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.openbis.generic.server.util;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/util/SpaceIdentifierHelper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/util/SpaceIdentifierHelper.java
index 129c04a2bde..48857709882 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/util/SpaceIdentifierHelper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/util/SpaceIdentifierHelper.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.generic.server.util;
 
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.IAuthorizationDAOFactory;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/AbstractOpenBisServiceFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/AbstractOpenBisServiceFactory.java
index 2bde6db5c89..f1f78ef9cdd 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/AbstractOpenBisServiceFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/AbstractOpenBisServiceFactory.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.generic.shared;
 
 import ch.systemsx.cisd.openbis.common.api.client.IServicePinger;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/AbstractServerLogger.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/AbstractServerLogger.java
index ae0009ad95e..0011acea1ab 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/AbstractServerLogger.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/AbstractServerLogger.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.generic.shared;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/Constants.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/Constants.java
index 4159682e9e3..024ad3db8a1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/Constants.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/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.openbis.generic.shared;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/DatabaseCreateOrDeleteModification.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/DatabaseCreateOrDeleteModification.java
index 98815ed8172..9c8bc1d14cb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/DatabaseCreateOrDeleteModification.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/DatabaseCreateOrDeleteModification.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.generic.shared;
 
 import java.lang.annotation.ElementType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/DatabaseUpdateModification.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/DatabaseUpdateModification.java
index 271759554fb..a5666327a39 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/DatabaseUpdateModification.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/DatabaseUpdateModification.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.generic.shared;
 
 import java.lang.annotation.ElementType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/ICommonServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/ICommonServer.java
index c24d8151ed1..a30cea70018 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/ICommonServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/ICommonServer.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.generic.shared;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/ICustomImportService.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/ICustomImportService.java
index 9a36b36f53a..5e54ff5707e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/ICustomImportService.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/ICustomImportService.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.generic.shared;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/IDataStoreService.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/IDataStoreService.java
index aa320d2ae69..3335cef93b0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/IDataStoreService.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/IDataStoreService.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.generic.shared;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/IEntityImportService.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/IEntityImportService.java
index effab330fc8..7c3737683ab 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/IEntityImportService.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/IEntityImportService.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.systemsx.cisd.openbis.generic.shared;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/IJythonEvaluatorPool.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/IJythonEvaluatorPool.java
index 6d5e64e4cef..72cfe11577b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/IJythonEvaluatorPool.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/IJythonEvaluatorPool.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.generic.shared;
 
 import ch.systemsx.cisd.openbis.generic.shared.managed_property.IEvaluationRunner;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/IOpenBisSessionManager.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/IOpenBisSessionManager.java
index 174cf726368..aaea8979bb3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/IOpenBisSessionManager.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/IOpenBisSessionManager.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.generic.shared;
 
 import ch.systemsx.cisd.authentication.ISessionManager;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/IRemoteHostValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/IRemoteHostValidator.java
index fbe6e4b252a..176288095f7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/IRemoteHostValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/IRemoteHostValidator.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.generic.shared;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/IServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/IServer.java
index f44d32c7560..91e9e3e6568 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/IServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/IServer.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.generic.shared;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/IServiceForDataStoreServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/IServiceForDataStoreServer.java
index 112f362b728..18dc5b01bc0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/IServiceForDataStoreServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/IServiceForDataStoreServer.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.generic.shared;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/ISessionProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/ISessionProvider.java
index 382067dbae6..6a33e2ce54f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/ISessionProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/ISessionProvider.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.generic.shared;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/ISessionWorkspaceProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/ISessionWorkspaceProvider.java
index f1a74437c8c..7ed1f3ff068 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/ISessionWorkspaceProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/ISessionWorkspaceProvider.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.generic.shared;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/ITrackingServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/ITrackingServer.java
index 864fdbed9e7..ff1813e7ed1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/ITrackingServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/ITrackingServer.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.generic.shared;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/LogMessagePrefixGenerator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/LogMessagePrefixGenerator.java
index 8f380ea6d37..f649cba0bd7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/LogMessagePrefixGenerator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/LogMessagePrefixGenerator.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.generic.shared;
 
 import ch.systemsx.cisd.authentication.ILogMessagePrefixGenerator;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/OpenBisServiceFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/OpenBisServiceFactory.java
index fe7c6f83268..4e58b926ec1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/OpenBisServiceFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/OpenBisServiceFactory.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.generic.shared;
 
 import ch.systemsx.cisd.openbis.common.api.client.IServicePinger;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/OpenBisServiceV3Factory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/OpenBisServiceV3Factory.java
index 6ac1f7f309f..549b9b896fb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/OpenBisServiceV3Factory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/OpenBisServiceV3Factory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 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.generic.shared;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.IApplicationServerApi;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/ResourceNames.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/ResourceNames.java
index afb075c8cde..f6c56ade3de 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/ResourceNames.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/ResourceNames.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.generic.shared;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/SessionWorkspaceProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/SessionWorkspaceProvider.java
index dad4833999b..b33d92b9ccf 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/SessionWorkspaceProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/SessionWorkspaceProvider.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.systemsx.cisd.openbis.generic.shared;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/WebClientConfigurationProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/WebClientConfigurationProvider.java
index 706ca768447..638af5e558d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/WebClientConfigurationProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/WebClientConfigurationProvider.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.generic.shared;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/IWebInformationService.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/IWebInformationService.java
index f0580cc8552..db21865ef40 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/IWebInformationService.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/IWebInformationService.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.generic.shared.api.v1;
 
 import ch.systemsx.cisd.common.api.IRpcService;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/Translator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/Translator.java
index 4a3abdb7735..dbd3ec99f04 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/Translator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/Translator.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.generic.shared.api.v1;
 
 import static ch.systemsx.cisd.common.collection.CollectionUtils.nullSafe;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/json/GenericJsonClassValueToClassObjectsMapping.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/json/GenericJsonClassValueToClassObjectsMapping.java
index 8cff7059162..59a111e90fc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/json/GenericJsonClassValueToClassObjectsMapping.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/json/GenericJsonClassValueToClassObjectsMapping.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.generic.shared.api.v1.json;
 
 import ch.systemsx.cisd.openbis.common.api.server.json.mapping.JsonStaticClassValueToClassObjectsMapping;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/json/GenericObjectMapper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/json/GenericObjectMapper.java
index db66504601b..84bca9b60bb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/json/GenericObjectMapper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/json/GenericObjectMapper.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.generic.shared.api.v1.json;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/json/JsonBaseTypeToSubTypesMapping.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/json/JsonBaseTypeToSubTypesMapping.java
index 7306b351c1d..bf12ced1fa9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/json/JsonBaseTypeToSubTypesMapping.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/json/JsonBaseTypeToSubTypesMapping.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.generic.shared.api.v1.json;
 
 import ch.systemsx.cisd.openbis.common.api.server.json.mapping.JsonReflectionsBaseTypeToSubTypesMapping;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/json/ObjectMapperResource.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/json/ObjectMapperResource.java
index fc2da5a7638..d6364fb7b4c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/json/ObjectMapperResource.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/json/ObjectMapperResource.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.generic.shared.api.v1.json;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/AuthorizationConfig.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/AuthorizationConfig.java
index bea0984c570..ae0557513f4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/AuthorizationConfig.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/AuthorizationConfig.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.generic.shared.authorization;
 
 import java.util.regex.Matcher;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/AuthorizationConfigFacade.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/AuthorizationConfigFacade.java
index d3907cec734..d053c05f3b4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/AuthorizationConfigFacade.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/AuthorizationConfigFacade.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.generic.shared.authorization;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/AuthorizationConfigProperties.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/AuthorizationConfigProperties.java
index 3ad549a8eda..b44e8c063da 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/AuthorizationConfigProperties.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/AuthorizationConfigProperties.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.generic.shared.authorization;
 
 import java.util.Properties;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/IAuthorizationConfig.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/IAuthorizationConfig.java
index e35ebccd120..dde4bb07c69 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/IAuthorizationConfig.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/IAuthorizationConfig.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.generic.shared.authorization;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/IAuthorizationConfigProperties.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/IAuthorizationConfigProperties.java
index d1c4cdf1ecc..c5faacaaa76 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/IAuthorizationConfigProperties.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/IAuthorizationConfigProperties.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.generic.shared.authorization;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/AttachmentDownloadConstants.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/AttachmentDownloadConstants.java
index 220297e6f93..014d50a0ef4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/AttachmentDownloadConstants.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/AttachmentDownloadConstants.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.generic.shared.basic;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/AttributeSearchFieldKindProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/AttributeSearchFieldKindProvider.java
index 12baaacdf1e..bada2942e42 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/AttributeSearchFieldKindProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/AttributeSearchFieldKindProvider.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.generic.shared.basic;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetAttributeSearchFieldKind;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/BasicConstant.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/BasicConstant.java
index bbcc17347a0..d4999256048 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/BasicConstant.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/BasicConstant.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.generic.shared.basic;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/BasicEntityInformationHolder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/BasicEntityInformationHolder.java
index 7cde4ef900a..ec809d82493 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/BasicEntityInformationHolder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/BasicEntityInformationHolder.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.generic.shared.basic;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/BasicURLEncoder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/BasicURLEncoder.java
index dcd94c18b90..cb8ff7da2f7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/BasicURLEncoder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/BasicURLEncoder.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.generic.shared.basic;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/CodeConverter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/CodeConverter.java
index a0f04275425..3dd08638c28 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/CodeConverter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/CodeConverter.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.generic.shared.basic;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.BasicConstant.INTERNAL_NAMESPACE_PREFIX;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/CodeNormalizer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/CodeNormalizer.java
index f85979a7d0f..52e78985dcc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/CodeNormalizer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/CodeNormalizer.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.generic.shared.basic;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.CodeAndLabel;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/DataSetUploadInfo.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/DataSetUploadInfo.java
index 66659a214e6..edbfd5b1c91 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/DataSetUploadInfo.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/DataSetUploadInfo.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.generic.shared.basic;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/DatasetImageOverviewUtilities.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/DatasetImageOverviewUtilities.java
index fc1bba83a4a..ebe3c46ed72 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/DatasetImageOverviewUtilities.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/DatasetImageOverviewUtilities.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.generic.shared.basic;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ImageResolutionKind;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/DeletionUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/DeletionUtils.java
index 749e10ab289..e5896f71b0e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/DeletionUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/DeletionUtils.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.generic.shared.basic;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Deletion;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/EntityOperationsState.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/EntityOperationsState.java
index 0afc272c645..53a6528eabe 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/EntityOperationsState.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/EntityOperationsState.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.generic.shared.basic;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/EntityVisitComparatorByTimeStamp.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/EntityVisitComparatorByTimeStamp.java
index ff5d5b6d45c..ff07804db4e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/EntityVisitComparatorByTimeStamp.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/EntityVisitComparatorByTimeStamp.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.generic.shared.basic;
 
 import java.util.Comparator;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ExpressionUtil.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ExpressionUtil.java
index 5e829809d8c..236182c248b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ExpressionUtil.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ExpressionUtil.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.generic.shared.basic;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/GenericSharedConstants.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/GenericSharedConstants.java
index 76a10f9f99d..a99cb8524a3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/GenericSharedConstants.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/GenericSharedConstants.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.generic.shared.basic;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/GridCustomColumnValue.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/GridCustomColumnValue.java
index 4fa7a7288d1..bd0af1f11c0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/GridCustomColumnValue.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/GridCustomColumnValue.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.generic.shared.basic;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/GridRowModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/GridRowModel.java
index 8e4b6c13a18..5638836ea2d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/GridRowModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/GridRowModel.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.generic.shared.basic;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IAttachmentHolder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IAttachmentHolder.java
index e2be2ced7b1..55c21b49011 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IAttachmentHolder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IAttachmentHolder.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.generic.shared.basic;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AttachmentHolderKind;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IColumnDefinition.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IColumnDefinition.java
index 16809f5f8db..e05412efd1b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IColumnDefinition.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IColumnDefinition.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.generic.shared.basic;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IDeletionProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IDeletionProvider.java
index f03c91ec2b5..f7182c38ea7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IDeletionProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IDeletionProvider.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.generic.shared.basic;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Deletion;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IEntityInformationHolder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IEntityInformationHolder.java
index d9bc59b4483..bd3e11bbae7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IEntityInformationHolder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IEntityInformationHolder.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.generic.shared.basic;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IEntityInformationHolderWithIdentifier.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IEntityInformationHolderWithIdentifier.java
index 4201df39220..cb80b3749d4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IEntityInformationHolderWithIdentifier.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IEntityInformationHolderWithIdentifier.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.generic.shared.basic;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IEntityInformationHolderWithPermId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IEntityInformationHolderWithPermId.java
index 170736074c2..45c1d9e3232 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IEntityInformationHolderWithPermId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IEntityInformationHolderWithPermId.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.generic.shared.basic;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IEntityInformationHolderWithProperties.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IEntityInformationHolderWithProperties.java
index 80f5835ada4..36a56a23b13 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IEntityInformationHolderWithProperties.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IEntityInformationHolderWithProperties.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.generic.shared.basic;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IEntityPropertiesHolder;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IEntityWithDeletionInformation.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IEntityWithDeletionInformation.java
index 1d4c5b4d92d..db9b2a73440 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IEntityWithDeletionInformation.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IEntityWithDeletionInformation.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.generic.shared.basic;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IIdentityHolder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IIdentityHolder.java
index 947f349b2d8..89a5a875734 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IIdentityHolder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IIdentityHolder.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.generic.shared.basic;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IIsStub.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IIsStub.java
index 914f43e7a75..6955f518ccb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IIsStub.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IIsStub.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.generic.shared.basic;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IManagedPropertyGridInformationProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IManagedPropertyGridInformationProvider.java
index ed999373ca4..ae3a7f810e1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IManagedPropertyGridInformationProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IManagedPropertyGridInformationProvider.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.generic.shared.basic;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IPermIdHolder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IPermIdHolder.java
index 02f858a48f0..8b8e40815cc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IPermIdHolder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IPermIdHolder.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.generic.shared.basic;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IReportInformationProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IReportInformationProvider.java
index 3caf29502d1..94b6d1b0280 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IReportInformationProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IReportInformationProvider.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.generic.shared.basic;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ITableModelTransformation.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ITableModelTransformation.java
index 26a14d49bb7..686335fe8c2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ITableModelTransformation.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ITableModelTransformation.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.generic.shared.basic;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModel;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ITaggable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ITaggable.java
index 4f3a963bd70..57781ab34a3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ITaggable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ITaggable.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.generic.shared.basic;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IdentifierExtractor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IdentifierExtractor.java
index 0c2ff0cff18..f12142c96ff 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IdentifierExtractor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IdentifierExtractor.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.generic.shared.basic;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/MaterialCodeConverter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/MaterialCodeConverter.java
index 184f94fc355..78fdc9a4d9a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/MaterialCodeConverter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/MaterialCodeConverter.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.generic.shared.basic;
 
 import ch.systemsx.cisd.openbis.generic.shared.util.MaterialConfigurationProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/MetaprojectName.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/MetaprojectName.java
index 551172fd6a3..e738d8c90d8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/MetaprojectName.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/MetaprojectName.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.generic.shared.basic;
 
 import java.util.regex.Pattern;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/MetaprojectNameConstants.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/MetaprojectNameConstants.java
index 6aa49776e98..eb4340ed6ab 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/MetaprojectNameConstants.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/MetaprojectNameConstants.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.generic.shared.basic;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/PermlinkUtilities.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/PermlinkUtilities.java
index 95879c13495..c9d782f7867 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/PermlinkUtilities.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/PermlinkUtilities.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.generic.shared.basic;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AttachmentHolderKind;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/PrimitiveValue.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/PrimitiveValue.java
index 2d9eb384a9e..ea9c653c5d1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/PrimitiveValue.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/PrimitiveValue.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.generic.shared.basic;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/SearchlinkUtilities.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/SearchlinkUtilities.java
index d4d18579bde..5cf0a6c3e3e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/SearchlinkUtilities.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/SearchlinkUtilities.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.openbis.generic.shared.basic;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/SessionConstants.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/SessionConstants.java
index be6ea858b4d..07c26afbb3b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/SessionConstants.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/SessionConstants.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.generic.shared.basic;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/SimpleDateRenderer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/SimpleDateRenderer.java
index 3a5dc36262d..2495c91e04b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/SimpleDateRenderer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/SimpleDateRenderer.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.generic.shared.basic;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/SimpleImageHtmlRenderer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/SimpleImageHtmlRenderer.java
index 0fb58d8d0e9..da004e860ad 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/SimpleImageHtmlRenderer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/SimpleImageHtmlRenderer.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.generic.shared.basic;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/SimplePersonRenderer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/SimplePersonRenderer.java
index 65d041ae25f..531370d19ee 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/SimplePersonRenderer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/SimplePersonRenderer.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.generic.shared.basic;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Person;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/SimpleYesNoRenderer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/SimpleYesNoRenderer.java
index 11106a6bbd9..5896dcf30ea 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/SimpleYesNoRenderer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/SimpleYesNoRenderer.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.generic.shared.basic;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/TableCellUtil.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/TableCellUtil.java
index f5e76fcecf6..40afdc804fc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/TableCellUtil.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/TableCellUtil.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.generic.shared.basic;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataTypeCode;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/TableModelAppender.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/TableModelAppender.java
index dee47f32831..cc9310a57ce 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/TableModelAppender.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/TableModelAppender.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.generic.shared.basic;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/URLMethodWithParameters.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/URLMethodWithParameters.java
index 6868194fed5..fb94087cb62 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/URLMethodWithParameters.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/URLMethodWithParameters.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.generic.shared.basic;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ValidationUtilities.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ValidationUtilities.java
index 78c16bdb349..96d84692d63 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ValidationUtilities.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ValidationUtilities.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.generic.shared.basic;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ViewMode.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ViewMode.java
index 7f9982e34a2..599f1cd17a7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ViewMode.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ViewMode.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.generic.shared.basic;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/WebAppProperties.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/WebAppProperties.java
index e6e5c6e4939..98821ccecde 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/WebAppProperties.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/WebAppProperties.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.generic.shared.basic;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/WebAppsProperties.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/WebAppsProperties.java
index 134f5920427..1fe00405805 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/WebAppsProperties.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/WebAppsProperties.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.generic.shared.basic;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/WildcardSupportingMap.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/WildcardSupportingMap.java
index 727fc5652e8..c0ad30ffef2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/WildcardSupportingMap.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/WildcardSupportingMap.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.generic.shared.basic;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/annotation/DoNotEscape.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/annotation/DoNotEscape.java
index 3f0cdeec127..a18271db13c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/annotation/DoNotEscape.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/annotation/DoNotEscape.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.openbis.generic.shared.basic.annotation;
 
 import java.lang.annotation.ElementType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractEntityProperty.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractEntityProperty.java
index 35b4f84a6a3..3bcc95fbeb4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractEntityProperty.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractEntityProperty.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractExpression.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractExpression.java
index 871f4e5239d..f516231018c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractExpression.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractExpression.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractExpressionWithParameters.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractExpressionWithParameters.java
index 0e2d7715ff4..525e5b7ad7e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractExpressionWithParameters.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractExpressionWithParameters.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.generic.shared.basic.dto;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractExternalData.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractExternalData.java
index 3eed6a44edd..6384050bff4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractExternalData.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractExternalData.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractProjectUpdates.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractProjectUpdates.java
index 4b4d0d156a6..17f2a743ce8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractProjectUpdates.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractProjectUpdates.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractType.java
index 0da0b506d38..9391a4b4525 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractType.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ArchiverDataSetCriteria.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ArchiverDataSetCriteria.java
index e9792670042..75c9a054482 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ArchiverDataSetCriteria.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ArchiverDataSetCriteria.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ArchivingServiceKind.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ArchivingServiceKind.java
index a9e840db6c7..2eb0b89da03 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ArchivingServiceKind.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ArchivingServiceKind.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AssociatedEntityKind.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AssociatedEntityKind.java
index 91fee5efe1a..357f5e2bf7e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AssociatedEntityKind.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AssociatedEntityKind.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AsyncBatchRegistrationResult.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AsyncBatchRegistrationResult.java
index 7246e0361dc..2cfa62b4903 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AsyncBatchRegistrationResult.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AsyncBatchRegistrationResult.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.generic.shared.basic.dto;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Attachment.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Attachment.java
index 4166f2f581b..e35987a4d7b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Attachment.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Attachment.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AttachmentHolderKind.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AttachmentHolderKind.java
index 23ad8311218..e3eb132f97e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AttachmentHolderKind.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AttachmentHolderKind.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AttachmentVersions.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AttachmentVersions.java
index c46ce00ddab..2744bf0cef5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AttachmentVersions.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AttachmentVersions.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AttachmentWithContent.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AttachmentWithContent.java
index 652ffaf764f..c36ca3e48be 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AttachmentWithContent.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AttachmentWithContent.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AuthorizationGroup.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AuthorizationGroup.java
index c1594473df1..054590971ee 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AuthorizationGroup.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AuthorizationGroup.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.generic.shared.basic.dto;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AuthorizationGroupUpdates.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AuthorizationGroupUpdates.java
index 4842d8524cb..64ae4aad496 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AuthorizationGroupUpdates.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AuthorizationGroupUpdates.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicDataSetUpdates.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicDataSetUpdates.java
index 2d9af8cbcf1..0197cafb930 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicDataSetUpdates.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicDataSetUpdates.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicEntityDescription.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicEntityDescription.java
index 6bba92ccd46..d9d136d5858 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicEntityDescription.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicEntityDescription.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.openbis.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicEntityType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicEntityType.java
index 1cad50cf868..4475357055c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicEntityType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicEntityType.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.generic.shared.basic.dto;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicExperimentUpdates.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicExperimentUpdates.java
index 610ee016645..3ad523918c3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicExperimentUpdates.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicExperimentUpdates.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicMetaprojectUpdates.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicMetaprojectUpdates.java
index de25ec38e7e..ec3c7ace26b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicMetaprojectUpdates.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicMetaprojectUpdates.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicProjectIdentifier.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicProjectIdentifier.java
index 5f716b679fb..8fd1666e39c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicProjectIdentifier.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicProjectIdentifier.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicSampleUpdates.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicSampleUpdates.java
index 23831a396d6..61411bab122 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicSampleUpdates.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BasicSampleUpdates.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BatchOperationKind.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BatchOperationKind.java
index 44f10dffb78..ffe6d61631e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BatchOperationKind.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BatchOperationKind.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BatchRegistrationResult.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BatchRegistrationResult.java
index ccefc091aca..ad537622df1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BatchRegistrationResult.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/BatchRegistrationResult.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CodeAndLabel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CodeAndLabel.java
index ed299178d84..ff6c0d988f6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CodeAndLabel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CodeAndLabel.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ColumnSetting.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ColumnSetting.java
index 386532bb246..71f42e0b2a7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ColumnSetting.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ColumnSetting.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CommonAttributeSearchFieldKindDecsriptions.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CommonAttributeSearchFieldKindDecsriptions.java
index 304cd1597d9..8069ddcbb61 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CommonAttributeSearchFieldKindDecsriptions.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CommonAttributeSearchFieldKindDecsriptions.java
@@ -1,7 +1,7 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
- * Licensed under the Apache License, Version 2.0 _DESCRIPTION = 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
  *
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CommonGridIDs.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CommonGridIDs.java
index dc25d12650f..96d00a28a97 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CommonGridIDs.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CommonGridIDs.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CompareType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CompareType.java
index 1dc83931382..933e033797b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CompareType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CompareType.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.generic.shared.basic.dto;
 
 public enum CompareType
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ContainerDataSet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ContainerDataSet.java
index 98f17f4298c..4e21e631fe2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ContainerDataSet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ContainerDataSet.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.generic.shared.basic.dto;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CorePlugin.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CorePlugin.java
index 6d67edb2672..bb0db4b4ba2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CorePlugin.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CorePlugin.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.generic.shared.basic.dto;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CustomImport.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CustomImport.java
index 11118074ac6..4403066d338 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CustomImport.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CustomImport.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CustomImportFile.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CustomImportFile.java
index 9a5bcf21e98..eb39e9e63c6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CustomImportFile.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CustomImportFile.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetArchivingStatus.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetArchivingStatus.java
index fa04df80849..96823a72e8f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetArchivingStatus.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetArchivingStatus.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.generic.shared.basic.dto;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetAttributeSearchFieldKind.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetAttributeSearchFieldKind.java
index cfc50f83c1b..9d2f9af5879 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetAttributeSearchFieldKind.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetAttributeSearchFieldKind.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetBatchUpdateDetails.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetBatchUpdateDetails.java
index 908ebec9a5b..6d85c7e1a3f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetBatchUpdateDetails.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetBatchUpdateDetails.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetKind.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetKind.java
index 6b9762a3619..fb9c2134047 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetKind.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetKind.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetRelatedEntities.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetRelatedEntities.java
index 0d7cb6ccd0b..c8b1e8829f7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetRelatedEntities.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetRelatedEntities.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetRelationshipRole.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetRelationshipRole.java
index ad5394cd197..b379ebef6ef 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetRelationshipRole.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetRelationshipRole.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetType.java
index ce4a9890bb2..ddf555f56bb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetType.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.generic.shared.basic.dto;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetTypePropertyType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetTypePropertyType.java
index 98a92beb08d..c2645ae23d8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetTypePropertyType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetTypePropertyType.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetTypeWithVocabularyTerms.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetTypeWithVocabularyTerms.java
index 11a8a782118..72d24680426 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetTypeWithVocabularyTerms.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetTypeWithVocabularyTerms.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetUpdateResult.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetUpdateResult.java
index 06191cf0312..fb73599ff51 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetUpdateResult.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataSetUpdateResult.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataStore.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataStore.java
index 3e984cd1fff..d4636a65041 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataStore.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataStore.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataStoreServiceKind.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataStoreServiceKind.java
index 751b62bd725..8aeded90953 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataStoreServiceKind.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataStoreServiceKind.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataType.java
index c8f68de40eb..e69a8aef228 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataType.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatabaseModificationKind.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatabaseModificationKind.java
index 5e2ff012567..92734873f09 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatabaseModificationKind.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatabaseModificationKind.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatasetLocation.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatasetLocation.java
index c94a1cf2829..58eb4930504 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatasetLocation.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatasetLocation.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatasetLocationNode.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatasetLocationNode.java
index eae3c6b3251..b75485caf89 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatasetLocationNode.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatasetLocationNode.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatastoreServiceDescription.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatastoreServiceDescription.java
index a1c4785c9aa..5036e7002a6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatastoreServiceDescription.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatastoreServiceDescription.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DateTableCell.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DateTableCell.java
index 95dcb099f29..401f4b4cbd7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DateTableCell.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DateTableCell.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.generic.shared.basic.dto;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DeletedDataSet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DeletedDataSet.java
index 141a65c1e8a..bb7696a0f1d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DeletedDataSet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DeletedDataSet.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DeletedDataSetLocation.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DeletedDataSetLocation.java
index 96782ebeea3..baa4a62a5f8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DeletedDataSetLocation.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DeletedDataSetLocation.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DeletedEntity.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DeletedEntity.java
index bd0a9c05293..153f5085b82 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DeletedEntity.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DeletedEntity.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.openbis.generic.shared.basic.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.IEntityInformationHolderWithIdentifier;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Deletion.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Deletion.java
index c8e4b0d736d..605e9f50a80 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Deletion.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Deletion.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.generic.shared.basic.dto;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DeletionType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DeletionType.java
index 665510f8a5e..2492586b940 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DeletionType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DeletionType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailViewConfiguration.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailViewConfiguration.java
index 5591f18abd6..c09d7cbfca8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailViewConfiguration.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailViewConfiguration.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.openbis.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchCriteria.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchCriteria.java
index 47afda719d6..49303d3f18c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchCriteria.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchCriteria.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchCriterion.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchCriterion.java
index f8798f19648..f642022305d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchCriterion.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchCriterion.java
@@ -1,6 +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.
@@ -14,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchField.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchField.java
index 95371a3b231..a0915141050 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchField.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchField.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchFieldKind.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchFieldKind.java
index 2bb86f63c60..1d32c95f763 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchFieldKind.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchFieldKind.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchSubCriteria.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchSubCriteria.java
index 0ac7c0db68a..2b7091cdfe0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchSubCriteria.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchSubCriteria.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.openbis.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DisplaySettings.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DisplaySettings.java
index 1f86f7e0926..db924e6e036 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DisplaySettings.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DisplaySettings.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DoubleTableCell.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DoubleTableCell.java
index f71986f9748..d34dfd445de 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DoubleTableCell.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DoubleTableCell.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DssLinkTableCell.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DssLinkTableCell.java
index 23acb1d1a17..eb606127ed1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DssLinkTableCell.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DssLinkTableCell.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.generic.shared.basic.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.URLMethodWithParameters;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DynamicPropertyEvaluationInfo.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DynamicPropertyEvaluationInfo.java
index 72c6727ff20..9bf175becd9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DynamicPropertyEvaluationInfo.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DynamicPropertyEvaluationInfo.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.openbis.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityHistory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityHistory.java
index d2fde94a815..ccbfe95cebb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityHistory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityHistory.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityKindAndTypeCode.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityKindAndTypeCode.java
index 628e769a4db..b06a6240b58 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityKindAndTypeCode.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityKindAndTypeCode.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityProperty.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityProperty.java
index 0cf3bb066fd..02d730aa5b6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityProperty.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityProperty.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityReference.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityReference.java
index 3ae7c37ae63..b88838eb31e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityReference.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityReference.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityTableCell.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityTableCell.java
index a930ed7c259..0c392ef3640 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityTableCell.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityTableCell.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityType.java
index bdb666a8d27..edd61a73e1c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityType.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.generic.shared.basic.dto;
 
 import java.util.Collections;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityTypePropertyType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityTypePropertyType.java
index 914b42a7c3f..721705de8a7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityTypePropertyType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityTypePropertyType.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityValidationEvaluationInfo.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityValidationEvaluationInfo.java
index 4a3d14c30a0..159fff1c637 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityValidationEvaluationInfo.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityValidationEvaluationInfo.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.openbis.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityVisit.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityVisit.java
index 143c2d1d7e4..58c642b6bc7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityVisit.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityVisit.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Experiment.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Experiment.java
index bcf9feb92f6..7be474770d5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Experiment.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Experiment.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.generic.shared.basic.dto;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentAttributeSearchFieldKind.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentAttributeSearchFieldKind.java
index 833f964c781..04aa8b5fab7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentAttributeSearchFieldKind.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentAttributeSearchFieldKind.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentBatchUpdateDetails.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentBatchUpdateDetails.java
index e6882714d09..71e8899ed2f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentBatchUpdateDetails.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentBatchUpdateDetails.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentFetchOption.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentFetchOption.java
index 7ba1e6ecb86..53b45a8a52a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentFetchOption.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentFetchOption.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentFetchOptions.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentFetchOptions.java
index c11a2c2afbd..85b253f8dae 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentFetchOptions.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentFetchOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentType.java
index bf62425ba5b..ce346505c32 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentType.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.generic.shared.basic.dto;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentTypePropertyType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentTypePropertyType.java
index 28a8fe80672..4a1564aa0d9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentTypePropertyType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentTypePropertyType.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentUpdateResult.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentUpdateResult.java
index 1d4ffca823f..42fb0f7fa7d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentUpdateResult.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentUpdateResult.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentUpdates.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentUpdates.java
index 04d12d767dc..7a3d61bae94 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentUpdates.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExperimentUpdates.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.generic.shared.basic.dto;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExternalDataLocationNode.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExternalDataLocationNode.java
index ef5b273f4f3..77abed3c575 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExternalDataLocationNode.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExternalDataLocationNode.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.generic.shared.basic.dto;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/FileFormatType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/FileFormatType.java
index c2d6dc22762..84875c748b8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/FileFormatType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/FileFormatType.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/FileSystemContentCopy.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/FileSystemContentCopy.java
index cbd1bec1556..bbdcab32a22 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/FileSystemContentCopy.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/FileSystemContentCopy.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.generic.shared.basic.dto;
 
 public class FileSystemContentCopy implements IContentCopy
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/GeneratedImageTableCell.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/GeneratedImageTableCell.java
index eaf58a94be5..047e0c7b276 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/GeneratedImageTableCell.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/GeneratedImageTableCell.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.generic.shared.basic.dto;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/GenericEntityProperty.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/GenericEntityProperty.java
index 39c1ebe5338..366b12d46dc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/GenericEntityProperty.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/GenericEntityProperty.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Grantee.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Grantee.java
index 20b216927e4..8c961e26690 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Grantee.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Grantee.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/GridCustomColumn.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/GridCustomColumn.java
index 77e9706114c..d8a284f3085 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/GridCustomColumn.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/GridCustomColumn.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/GridCustomFilter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/GridCustomFilter.java
index ee9dbd1df71..dd8949d4388 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/GridCustomFilter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/GridCustomFilter.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IAttributeSearchFieldKind.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IAttributeSearchFieldKind.java
index c91f63c8e3c..4296f721807 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IAttributeSearchFieldKind.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IAttributeSearchFieldKind.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IContentCopy.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IContentCopy.java
index db6ca6e1245..99e871a2a3b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IContentCopy.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IContentCopy.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IDatasetLocation.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IDatasetLocation.java
index a7ba29ed6df..ade08542aae 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IDatasetLocation.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IDatasetLocation.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IDatasetLocationNode.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IDatasetLocationNode.java
index a24524cfeee..65327f79d76 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IDatasetLocationNode.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IDatasetLocationNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.generic.shared.basic.dto;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IDeletedDataSetLocation.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IDeletedDataSetLocation.java
index d3c32f7b1b4..5a165d61f92 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IDeletedDataSetLocation.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IDeletedDataSetLocation.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IEntityPropertiesHolder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IEntityPropertiesHolder.java
index 65f7cfbcb13..0aa94123bb7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IEntityPropertiesHolder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IEntityPropertiesHolder.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.generic.shared.basic.dto;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IEntityProperty.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IEntityProperty.java
index 656cacd3533..54625f86cd5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IEntityProperty.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IEntityProperty.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IExpressionUpdates.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IExpressionUpdates.java
index aad406108a6..43b873aacc7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IExpressionUpdates.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IExpressionUpdates.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IPropertiesBean.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IPropertiesBean.java
index ee86bc3619b..8998339a223 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IPropertiesBean.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IPropertiesBean.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IPropertyTypeUpdates.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IPropertyTypeUpdates.java
index 669e81d70de..e092b5ea6f6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IPropertyTypeUpdates.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IPropertyTypeUpdates.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.generic.shared.basic.dto;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IScriptUpdates.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IScriptUpdates.java
index e65520e279e..6c0123ca565 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IScriptUpdates.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IScriptUpdates.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.generic.shared.basic.dto;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ISearchFieldAvailability.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ISearchFieldAvailability.java
index bada2002dc1..391d96f11f2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ISearchFieldAvailability.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ISearchFieldAvailability.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ISearchFieldCriterionFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ISearchFieldCriterionFactory.java
index be817317804..c3b274763ca 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ISearchFieldCriterionFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ISearchFieldCriterionFactory.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ISearchFieldKind.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ISearchFieldKind.java
index 3a97d4d1f59..5b59c487995 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ISearchFieldKind.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ISearchFieldKind.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ISerializableComparable.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ISerializableComparable.java
index 7d6286e1406..3d910915019 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ISerializableComparable.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ISerializableComparable.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ISpaceUpdates.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ISpaceUpdates.java
index ebe7168dffa..5fc1ba12f97 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ISpaceUpdates.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ISpaceUpdates.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.generic.shared.basic.dto;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Identifier.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Identifier.java
index 5f74643c443..fdb1ce9740b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Identifier.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Identifier.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ImageResolutionKind.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ImageResolutionKind.java
index 0044255e17a..9b2b270b727 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ImageResolutionKind.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ImageResolutionKind.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ImageTableCell.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ImageTableCell.java
index c7c8fd20c01..f02569a819a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ImageTableCell.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ImageTableCell.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IntegerTableCell.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IntegerTableCell.java
index 7df4fb8a322..8652ba2b58f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IntegerTableCell.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IntegerTableCell.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LastModificationState.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LastModificationState.java
index 3f3522680a2..db27ba92e1b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LastModificationState.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LastModificationState.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkDataSet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkDataSet.java
index 48d7204ca0b..6f5b5fad396 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkDataSet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkDataSet.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.generic.shared.basic.dto;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkDataSetLocation.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkDataSetLocation.java
index 384512d02ce..d850a42693e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkDataSetLocation.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkDataSetLocation.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkDataSetUrl.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkDataSetUrl.java
index cf793058000..3c393df9d25 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkDataSetUrl.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkDataSetUrl.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.generic.shared.basic.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.BasicConstant;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkModel.java
index 47eecfdf4e1..d1a147304df 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkModel.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkTableCell.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkTableCell.java
index 7d64ea7af82..ad55e7e6645 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkTableCell.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkTableCell.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.generic.shared.basic.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.URLMethodWithParameters;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListDataSetByPropertyCriteria.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListDataSetByPropertyCriteria.java
index 9ac0a46e44a..cbe9e38b0c8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListDataSetByPropertyCriteria.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListDataSetByPropertyCriteria.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListMaterialCriteria.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListMaterialCriteria.java
index 0b9dafeeca8..f3e302b6145 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListMaterialCriteria.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListMaterialCriteria.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListOrSearchSampleCriteria.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListOrSearchSampleCriteria.java
index 677f52ec2bb..492edf411c4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListOrSearchSampleCriteria.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListOrSearchSampleCriteria.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.generic.shared.basic.dto;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListSampleCriteria.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListSampleCriteria.java
index 47ae0f8a5bd..13af10068fd 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListSampleCriteria.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ListSampleCriteria.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LocatorType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LocatorType.java
index b570fd6a707..a8fda9212f2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LocatorType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LocatorType.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedComboBoxInputWidgetDescription.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedComboBoxInputWidgetDescription.java
index 5410b3c610d..9d50cd8fcb2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedComboBoxInputWidgetDescription.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedComboBoxInputWidgetDescription.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.generic.shared.basic.dto;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedEntityProperty.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedEntityProperty.java
index f91d9cb9e90..a4ee098f6c2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedEntityProperty.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedEntityProperty.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.generic.shared.basic.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.api.IManagedProperty;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedHtmlWidgetDescription.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedHtmlWidgetDescription.java
index 576d5a2298a..f0d1ec880dc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedHtmlWidgetDescription.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedHtmlWidgetDescription.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.generic.shared.basic.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.api.IManagedOutputWidgetDescription;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedInputWidgetDescription.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedInputWidgetDescription.java
index 9d0696a861f..0dc46a9a9f5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedInputWidgetDescription.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedInputWidgetDescription.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.generic.shared.basic.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.api.IManagedInputWidgetDescription;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedMultilineTextInputWidgetDescription.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedMultilineTextInputWidgetDescription.java
index 7eec5551c2e..27fe222123e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedMultilineTextInputWidgetDescription.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedMultilineTextInputWidgetDescription.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.generic.shared.basic.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.api.ManagedInputFieldType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedProperty.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedProperty.java
index 2da6079de2e..817292dacf2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedProperty.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedProperty.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.generic.shared.basic.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.BasicConstant;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedTableWidgetDescription.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedTableWidgetDescription.java
index e56d523edfd..2f792d7c49d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedTableWidgetDescription.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedTableWidgetDescription.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.generic.shared.basic.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.api.IManagedOutputWidgetDescription;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedTextInputWidgetDescription.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedTextInputWidgetDescription.java
index 95fa257a027..8dfad4c6386 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedTextInputWidgetDescription.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedTextInputWidgetDescription.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.generic.shared.basic.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.api.ManagedInputFieldType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiActionDescription.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiActionDescription.java
index d11cb5d040e..8372da2ec45 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiActionDescription.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiActionDescription.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiActionDescriptionFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiActionDescriptionFactory.java
index 9db5d04fb3d..c2874e67c21 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiActionDescriptionFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiActionDescriptionFactory.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiDescription.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiDescription.java
index 4cd5888baad..0b58aeb27ac 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiDescription.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiDescription.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiTableActionDescription.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiTableActionDescription.java
index e5e98ad9835..6f995436bbe 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiTableActionDescription.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ManagedUiTableActionDescription.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MatchingEntity.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MatchingEntity.java
index 2198804903a..8ab01bf6bd1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MatchingEntity.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MatchingEntity.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MatchingEntityTableCell.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MatchingEntityTableCell.java
index 558597e03cf..f5517596054 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MatchingEntityTableCell.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MatchingEntityTableCell.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Material.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Material.java
index 9f122b8d1ac..4c52c6b1e19 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Material.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Material.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.generic.shared.basic.dto;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialAttributeSearchFieldKind.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialAttributeSearchFieldKind.java
index 2194a82ca74..79a7fd3168b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialAttributeSearchFieldKind.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialAttributeSearchFieldKind.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialBatchUpdateResultMessage.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialBatchUpdateResultMessage.java
index 919cb967089..3c742110ff3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialBatchUpdateResultMessage.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialBatchUpdateResultMessage.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.generic.shared.basic.dto;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialEntityProperty.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialEntityProperty.java
index 86ff90f2a62..038684986cb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialEntityProperty.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialEntityProperty.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialIdentifier.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialIdentifier.java
index 372efb5e22f..00ac7b9c30d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialIdentifier.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialIdentifier.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialType.java
index b8ac1c11d1b..730aff84733 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialType.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.generic.shared.basic.dto;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialTypePropertyType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialTypePropertyType.java
index f5aeac36104..bce05345888 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialTypePropertyType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialTypePropertyType.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectAssignments.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectAssignments.java
index 195a23a0939..73c99cd3a00 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectAssignments.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectAssignments.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectAssignmentsCount.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectAssignmentsCount.java
index 82090d8320c..ad4390a78af 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectAssignmentsCount.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectAssignmentsCount.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectAssignmentsFetchOption.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectAssignmentsFetchOption.java
index 6c08407e831..2d3bd2072eb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectAssignmentsFetchOption.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectAssignmentsFetchOption.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectAssignmentsIds.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectAssignmentsIds.java
index 1451de5e6a1..245822ecfeb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectAssignmentsIds.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectAssignmentsIds.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectCriteria.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectCriteria.java
index 62a5dea6c73..d5ae8d3764a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectCriteria.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectCriteria.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewAttachment.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewAttachment.java
index a896426e4e3..20d0fd8789b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewAttachment.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewAttachment.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewAuthorizationGroup.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewAuthorizationGroup.java
index 74ca2a91628..cceb37491f9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewAuthorizationGroup.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewAuthorizationGroup.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewBasicExperiment.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewBasicExperiment.java
index 1fed350eca5..bc65c12ce92 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewBasicExperiment.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewBasicExperiment.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewColumnOrFilter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewColumnOrFilter.java
index e84e4ee6078..60a0a05bb43 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewColumnOrFilter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewColumnOrFilter.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewDataSet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewDataSet.java
index af7d8144b13..1e1e22f80e7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewDataSet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewDataSet.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.generic.shared.basic.dto;
 
 import ch.systemsx.cisd.common.parser.BeanProperty;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewDataSetsWithTypes.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewDataSetsWithTypes.java
index 3b04fc0c25d..859ecd35267 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewDataSetsWithTypes.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewDataSetsWithTypes.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.generic.shared.basic.dto;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewETNewPTAssigments.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewETNewPTAssigments.java
index d8a3c6a7bfe..c746f466f7b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewETNewPTAssigments.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewETNewPTAssigments.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewETPTAssignment.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewETPTAssignment.java
index e72161c36f1..cbb05713d6f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewETPTAssignment.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewETPTAssignment.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewEntitiesWithTypes.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewEntitiesWithTypes.java
index 41b496be073..1e60d2a4dc2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewEntitiesWithTypes.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewEntitiesWithTypes.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewExperiment.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewExperiment.java
index 6c3cd90d5cd..658f263627d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewExperiment.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewExperiment.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.generic.shared.basic.dto;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewExperimentsWithType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewExperimentsWithType.java
index 58d70f2fc9e..dd3f0d60020 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewExperimentsWithType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewExperimentsWithType.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.generic.shared.basic.dto;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewExpression.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewExpression.java
index 8d88e7fad0d..7ce9be868af 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewExpression.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewExpression.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.openbis.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewMaterial.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewMaterial.java
index 5cd6dd5331c..2768119d5c6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewMaterial.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewMaterial.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewMaterialWithType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewMaterialWithType.java
index dd216333875..a99e0aa09e2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewMaterialWithType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewMaterialWithType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewMaterialsWithTypes.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewMaterialsWithTypes.java
index f0f3100d895..d486785ca3d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewMaterialsWithTypes.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewMaterialsWithTypes.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.generic.shared.basic.dto;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewMetaproject.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewMetaproject.java
index 33912203371..0fa39914cce 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewMetaproject.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewMetaproject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewPTNewAssigment.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewPTNewAssigment.java
index e39f248f499..6279ba7bd18 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewPTNewAssigment.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewPTNewAssigment.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewProject.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewProject.java
index d2547ed2858..de416d1412d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewProject.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewProject.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewSample.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewSample.java
index a25ee5cebf5..b8245796996 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewSample.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewSample.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.generic.shared.basic.dto;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewSamplesWithTypes.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewSamplesWithTypes.java
index 384c0873f0a..af7b4290093 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewSamplesWithTypes.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewSamplesWithTypes.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.generic.shared.basic.dto;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewSpace.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewSpace.java
index cafaf7a4d3c..c675852c358 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewSpace.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewSpace.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewVocabulary.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewVocabulary.java
index 26006eb1995..d04008c3f55 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewVocabulary.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/NewVocabulary.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.generic.shared.basic.dto;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Null.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Null.java
index cb6dd64cdfa..b863f638e5e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Null.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Null.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ParameterValue.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ParameterValue.java
index 877687e6c4d..e1b8abecb5e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ParameterValue.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ParameterValue.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.openbis.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ParameterWithValue.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ParameterWithValue.java
index 5f0c90ac7a5..ef5b754021e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ParameterWithValue.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ParameterWithValue.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PersonAdapter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PersonAdapter.java
index 04586ecb3c0..0945f6a6cda 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PersonAdapter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PersonAdapter.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.generic.shared.basic.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.api.IPerson;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PersonRole.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PersonRole.java
index 8133537a3bb..9558e244008 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PersonRole.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PersonRole.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PersonRoles.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PersonRoles.java
index 96c826ff4d9..c4bdb07d578 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PersonRoles.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PersonRoles.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PersonTableCell.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PersonTableCell.java
index b86b388a1fe..26f0ce7ad0d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PersonTableCell.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PersonTableCell.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PhysicalDataSet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PhysicalDataSet.java
index 16e325bc30f..35fed537a9c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PhysicalDataSet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PhysicalDataSet.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PlaceholderDataSet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PlaceholderDataSet.java
index 403b13aaca8..f7f088fd124 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PlaceholderDataSet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PlaceholderDataSet.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PluginType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PluginType.java
index 20b0e0c61b1..591da9aeabb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PluginType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PluginType.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PortletConfiguration.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PortletConfiguration.java
index 4412c2dadcc..43bec2360f5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PortletConfiguration.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PortletConfiguration.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Project.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Project.java
index 6e68a5036b9..d63bf09e4f6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Project.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Project.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.generic.shared.basic.dto;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ProjectUpdates.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ProjectUpdates.java
index 6b45231823a..be0e9f71b0b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ProjectUpdates.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ProjectUpdates.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.generic.shared.basic.dto;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PropertyMatch.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PropertyMatch.java
index 7f8635d0977..3b827abea98 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PropertyMatch.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PropertyMatch.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PropertyType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PropertyType.java
index bd7d157caaf..b78b99f6c40 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PropertyType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PropertyType.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.generic.shared.basic.dto;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PropertyTypeWithVocabulary.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PropertyTypeWithVocabulary.java
index c93b706174d..fbf29bed0ad 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PropertyTypeWithVocabulary.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PropertyTypeWithVocabulary.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PropertyUpdates.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PropertyUpdates.java
index b43bb8132aa..5b5b7f35dec 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PropertyUpdates.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PropertyUpdates.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/QueryType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/QueryType.java
index 3865a690f1f..906a7124eb9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/QueryType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/QueryType.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RealNumberFormatingParameters.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RealNumberFormatingParameters.java
index e5e649cf63d..1bacbe99b64 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RealNumberFormatingParameters.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RealNumberFormatingParameters.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RelationshipType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RelationshipType.java
index c4448930a89..82831c995fd 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RelationshipType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RelationshipType.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.openbis.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ReportRowModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ReportRowModel.java
index bbde32f2ac3..4889e49c413 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ReportRowModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ReportRowModel.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ReportingPluginType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ReportingPluginType.java
index 1368a60829f..ab1e8152005 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ReportingPluginType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ReportingPluginType.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RoleAssignment.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RoleAssignment.java
index 42b26b5ce6a..047c5533eae 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RoleAssignment.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RoleAssignment.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RoleWithHierarchy.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RoleWithHierarchy.java
index b2e0f93d1a7..2dd9545deca 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RoleWithHierarchy.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RoleWithHierarchy.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Sample.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Sample.java
index 112cfa81ceb..8336dd6723c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Sample.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Sample.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.generic.shared.basic.dto;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleAttributeSearchFieldKind.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleAttributeSearchFieldKind.java
index 6926b420042..cd0aac1a3b8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleAttributeSearchFieldKind.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleAttributeSearchFieldKind.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleBatchUpdateDetails.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleBatchUpdateDetails.java
index 4aad68e084e..21075d8146b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleBatchUpdateDetails.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleBatchUpdateDetails.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleEntityProperty.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleEntityProperty.java
index b29e37557d8..2e93b1b74fd 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleEntityProperty.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleEntityProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 ETH Zuerich, SIS
+ * 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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleParentWithDerived.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleParentWithDerived.java
index 65a603b2b95..731bd607ad1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleParentWithDerived.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleParentWithDerived.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleType.java
index 90dce6bc4a8..bf3064e1517 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleType.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleTypePropertyType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleTypePropertyType.java
index c6ca092718d..43528d58421 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleTypePropertyType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleTypePropertyType.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleUpdateResult.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleUpdateResult.java
index 8b2d81a18af..32a1b13d181 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleUpdateResult.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SampleUpdateResult.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Script.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Script.java
index 261c6bfaf58..2d9f9082648 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Script.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Script.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.generic.shared.basic.dto;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ScriptType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ScriptType.java
index 02de7acdd2b..c199cb08656 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ScriptType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ScriptType.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ScriptUpdateResult.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ScriptUpdateResult.java
index 0e4830370bc..86f238af5cf 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ScriptUpdateResult.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ScriptUpdateResult.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SearchCriteriaConnection.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SearchCriteriaConnection.java
index 3898ab943ad..1f7a3b38bca 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SearchCriteriaConnection.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SearchCriteriaConnection.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SearchDomainSearchResultWithFullEntity.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SearchDomainSearchResultWithFullEntity.java
index fefdd2a7894..2395670900b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SearchDomainSearchResultWithFullEntity.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SearchDomainSearchResultWithFullEntity.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SearchFieldAvailableForAdmins.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SearchFieldAvailableForAdmins.java
index ba2ac1b1ce9..bfc8f6ee2fa 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SearchFieldAvailableForAdmins.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SearchFieldAvailableForAdmins.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SearchFieldBooleanCriterionFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SearchFieldBooleanCriterionFactory.java
index 427b43be5af..71da9ba6238 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SearchFieldBooleanCriterionFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SearchFieldBooleanCriterionFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SearchFieldDateCriterionFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SearchFieldDateCriterionFactory.java
index cfaf10b5315..9ce7fb990a0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SearchFieldDateCriterionFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SearchFieldDateCriterionFactory.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SerializableComparableIDDecorator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SerializableComparableIDDecorator.java
index d85b7200337..61089f65579 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SerializableComparableIDDecorator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SerializableComparableIDDecorator.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.generic.shared.basic.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SimpleAttributeSearchFieldKind.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SimpleAttributeSearchFieldKind.java
index 7069f5eb620..94dc0da727d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SimpleAttributeSearchFieldKind.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SimpleAttributeSearchFieldKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SortInfo.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SortInfo.java
index fd257ed8c2e..729825a3bb2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SortInfo.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SortInfo.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SourceType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SourceType.java
index 7a1b268e6e8..64ba2889564 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SourceType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/SourceType.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.
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Space.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Space.java
index 8b6d0dd563d..573e2f65916 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Space.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Space.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.generic.shared.basic.dto;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Span.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Span.java
index 5b30356fe27..c1a112a6528 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Span.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Span.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/StandardPortletNames.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/StandardPortletNames.java
index 93628e8b8da..05d47446025 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/StandardPortletNames.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/StandardPortletNames.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/StringTableCell.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/StringTableCell.java
index ecc93c0d4fc..e0a2ca9200a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/StringTableCell.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/StringTableCell.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.generic.shared.basic.dto;
 
 import ch.systemsx.cisd.common.shared.basic.string.StringUtils;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModel.java
index 475aeb19fef..048f0068894 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModel.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModelColumnHeader.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModelColumnHeader.java
index 40f4ec170df..34aa62a482d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModelColumnHeader.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModelColumnHeader.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModelRow.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModelRow.java
index cac0f79a1ef..5ecba8484b8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModelRow.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModelRow.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModelRowWithObject.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModelRowWithObject.java
index 121bd5ff80d..a8f1ddd771a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModelRowWithObject.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TableModelRowWithObject.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TrackingDataSetCriteria.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TrackingDataSetCriteria.java
index 975a771020b..1d26ed8a576 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TrackingDataSetCriteria.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TrackingDataSetCriteria.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TrackingSampleCriteria.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TrackingSampleCriteria.java
index 7d693f6a58e..1f0f31b9005 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TrackingSampleCriteria.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TrackingSampleCriteria.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TypedTableGridColumnDefinition.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TypedTableGridColumnDefinition.java
index e5fc51a99da..fea99af2b45 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TypedTableGridColumnDefinition.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TypedTableGridColumnDefinition.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TypedTableModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TypedTableModel.java
index 37788d799f0..fd542b27dea 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TypedTableModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/TypedTableModel.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/UpdatedBasicExperiment.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/UpdatedBasicExperiment.java
index 95990706e5a..b04d435cb76 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/UpdatedBasicExperiment.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/UpdatedBasicExperiment.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.generic.shared.basic.dto;
 
 import ch.systemsx.cisd.common.parser.BeanProperty;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/UpdatedDataSet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/UpdatedDataSet.java
index 0c4c314eda3..d94ce8c24f6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/UpdatedDataSet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/UpdatedDataSet.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/UpdatedExperimentsWithType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/UpdatedExperimentsWithType.java
index b9961c2dae3..1ff7e8e4733 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/UpdatedExperimentsWithType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/UpdatedExperimentsWithType.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.generic.shared.basic.dto;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/UpdatedSample.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/UpdatedSample.java
index 40e520d51be..f59b0e04d3a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/UpdatedSample.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/UpdatedSample.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/UpdatedVocabularyTerm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/UpdatedVocabularyTerm.java
index 3821070bb7b..a9271fa6b2d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/UpdatedVocabularyTerm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/UpdatedVocabularyTerm.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.generic.shared.basic.dto;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/UrlContentCopy.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/UrlContentCopy.java
index dd257e958eb..a65f710f907 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/UrlContentCopy.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/UrlContentCopy.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.generic.shared.basic.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.BasicConstant;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermBatchUpdateDetails.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermBatchUpdateDetails.java
index eef96e6e9f8..79efd0679a4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermBatchUpdateDetails.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermBatchUpdateDetails.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermEntityProperty.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermEntityProperty.java
index 9cb2a03aaab..60eb842d60f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermEntityProperty.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermEntityProperty.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermGridIDs.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermGridIDs.java
index 74a46a459e8..521d2b40416 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermGridIDs.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermGridIDs.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermReplacement.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermReplacement.java
index 674381bed78..b002e5d2ccb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermReplacement.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermReplacement.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermTableCell.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermTableCell.java
index fdc0efc7dd1..b0f314cdce9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermTableCell.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermTableCell.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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermWithStats.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermWithStats.java
index e0a0181f5d6..8a7a3ec47c4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermWithStats.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermWithStats.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/WebApp.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/WebApp.java
index a795acd22cc..45b941a86d7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/WebApp.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/WebApp.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/WebAppContext.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/WebAppContext.java
index 7c1bbbba504..f7dba391a4d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/WebAppContext.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/WebAppContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/WebAppProperty.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/WebAppProperty.java
index 7b60438a18d..1bedac33698 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/WebAppProperty.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/WebAppProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.generic.shared.basic.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/WebClientConfiguration.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/WebClientConfiguration.java
index 2df53078dad..b75e42aca61 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/WebClientConfiguration.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/WebClientConfiguration.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.generic.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedInputWidgetDescription.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedInputWidgetDescription.java
index cd35ca1a00e..22ae5dc34e3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedInputWidgetDescription.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedInputWidgetDescription.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.generic.shared.basic.dto.api;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedInputWidgetDescriptionFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedInputWidgetDescriptionFactory.java
index bd310f57e94..9f32a0f93ed 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedInputWidgetDescriptionFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedInputWidgetDescriptionFactory.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.generic.shared.basic.dto.api;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedOutputWidgetDescription.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedOutputWidgetDescription.java
index d3505902dc1..57a540a556f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedOutputWidgetDescription.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedOutputWidgetDescription.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.generic.shared.basic.dto.api;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedProperty.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedProperty.java
index cf71d73d712..4eb1471340b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedProperty.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedProperty.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.generic.shared.basic.dto.api;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiAction.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiAction.java
index 95cb1952e04..84f4093ea8f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiAction.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiAction.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.generic.shared.basic.dto.api;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiDescription.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiDescription.java
index 7421b5a050c..76c7e1f709a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiDescription.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiDescription.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.generic.shared.basic.dto.api;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiTableAction.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiTableAction.java
index 55270a876c3..0c2012c0ec9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiTableAction.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IManagedUiTableAction.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.generic.shared.basic.dto.api;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IPerson.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IPerson.java
index f57508066d1..59c36a36381 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IPerson.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/IPerson.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.generic.shared.basic.dto.api;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ITableModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ITableModel.java
index 9d2a284c9c1..17dc441f653 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ITableModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ITableModel.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.generic.shared.basic.dto.api;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedInputFieldType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedInputFieldType.java
index a685ce47981..5f1fe868ce5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedInputFieldType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedInputFieldType.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.generic.shared.basic.dto.api;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedOutputWidgetType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedOutputWidgetType.java
index b3c7eb08017..61fb595e5d3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedOutputWidgetType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedOutputWidgetType.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.generic.shared.basic.dto.api;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedTableActionRowSelectionType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedTableActionRowSelectionType.java
index b7ecc333c47..f5917ef2730 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedTableActionRowSelectionType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ManagedTableActionRowSelectionType.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.generic.shared.basic.dto.api;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ValidationException.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ValidationException.java
index c339cb3c569..b761fc98601 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ValidationException.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/api/ValidationException.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.generic.shared.basic.dto.api;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/MaterialBuilder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/MaterialBuilder.java
index 486f9791d35..75159325011 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/MaterialBuilder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/MaterialBuilder.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.openbis.generic.shared.basic.dto.builders;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/PropertyBuilder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/PropertyBuilder.java
index 2ca07c10822..2365ca8265b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/PropertyBuilder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/PropertyBuilder.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.generic.shared.basic.dto.builders;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.BasicConstant.CANONICAL_DATE_FORMAT_PATTERN;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/customcolumn/core/CustomColumnMethod.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/customcolumn/core/CustomColumnMethod.java
index 7ca7ea443b4..f08070e020c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/customcolumn/core/CustomColumnMethod.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/customcolumn/core/CustomColumnMethod.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.generic.shared.basic.dto.customcolumn.core;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/customcolumn/core/CustomColumnParam.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/customcolumn/core/CustomColumnParam.java
index 48315aaa18f..bdc58026932 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/customcolumn/core/CustomColumnParam.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/customcolumn/core/CustomColumnParam.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.generic.shared.basic.dto.customcolumn.core;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/customcolumn/extension/link/CustomColumnLinkParam.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/customcolumn/extension/link/CustomColumnLinkParam.java
index e8548c31db8..ecdfda2603a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/customcolumn/extension/link/CustomColumnLinkParam.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/customcolumn/extension/link/CustomColumnLinkParam.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.generic.shared.basic.dto.customcolumn.extension.link;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/displaysettings/ColumnDisplaySettingsUpdate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/displaysettings/ColumnDisplaySettingsUpdate.java
index ac20abf314c..aaa609fe97c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/displaysettings/ColumnDisplaySettingsUpdate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/displaysettings/ColumnDisplaySettingsUpdate.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.generic.shared.basic.dto.displaysettings;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/displaysettings/IDisplaySettingsUpdate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/displaysettings/IDisplaySettingsUpdate.java
index c91a571a2fa..d75e5c73876 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/displaysettings/IDisplaySettingsUpdate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/displaysettings/IDisplaySettingsUpdate.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.generic.shared.basic.dto.displaysettings;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/IObjectId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/IObjectId.java
index 49ee62a0f14..b4ffe4822a3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/IObjectId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/IObjectId.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.generic.shared.basic.dto.id;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/ObjectIdentifierId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/ObjectIdentifierId.java
index d05ab7acdf5..af5fe4d5e7b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/ObjectIdentifierId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/ObjectIdentifierId.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.generic.shared.basic.dto.id;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/ObjectPermIdId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/ObjectPermIdId.java
index ad1b41b83a0..dda94620290 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/ObjectPermIdId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/ObjectPermIdId.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.generic.shared.basic.dto.id;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/ObjectTechIdId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/ObjectTechIdId.java
index 7cc16a05368..acea008c381 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/ObjectTechIdId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/ObjectTechIdId.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.generic.shared.basic.dto.id;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/dataset/DataSetCodeId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/dataset/DataSetCodeId.java
index e3778573425..116680bb1d4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/dataset/DataSetCodeId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/dataset/DataSetCodeId.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.generic.shared.basic.dto.id.dataset;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/dataset/DataSetTechIdId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/dataset/DataSetTechIdId.java
index 8ae05a1ba2f..74f17b4e42e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/dataset/DataSetTechIdId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/dataset/DataSetTechIdId.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.generic.shared.basic.dto.id.dataset;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.id.ObjectTechIdId;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/dataset/IDataSetId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/dataset/IDataSetId.java
index 18b3259f3ec..a7c3bc2fdc3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/dataset/IDataSetId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/dataset/IDataSetId.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.generic.shared.basic.dto.id.dataset;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.id.IObjectId;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/entitytype/EntityTypePermIdId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/entitytype/EntityTypePermIdId.java
index 10ad21a2b71..feb067eb338 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/entitytype/EntityTypePermIdId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/entitytype/EntityTypePermIdId.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.generic.shared.basic.dto.id.entitytype;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.id.ObjectPermIdId;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/entitytype/IEntityTypeId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/entitytype/IEntityTypeId.java
index 18723425079..d1c596393f9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/entitytype/IEntityTypeId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/entitytype/IEntityTypeId.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.generic.shared.basic.dto.id.entitytype;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.id.IObjectId;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/experiment/ExperimentIdentifierId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/experiment/ExperimentIdentifierId.java
index bffc5c6e60e..7930b144fb6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/experiment/ExperimentIdentifierId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/experiment/ExperimentIdentifierId.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.generic.shared.basic.dto.id.experiment;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.id.ObjectIdentifierId;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/experiment/ExperimentPermIdId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/experiment/ExperimentPermIdId.java
index ec7b9696c75..d24e07bef8b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/experiment/ExperimentPermIdId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/experiment/ExperimentPermIdId.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.generic.shared.basic.dto.id.experiment;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.id.ObjectPermIdId;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/experiment/ExperimentTechIdId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/experiment/ExperimentTechIdId.java
index 8072c08d06c..5f4a7163836 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/experiment/ExperimentTechIdId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/experiment/ExperimentTechIdId.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.generic.shared.basic.dto.id.experiment;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.id.ObjectTechIdId;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/experiment/IExperimentId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/experiment/IExperimentId.java
index 212aceb8758..8d69ea4459e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/experiment/IExperimentId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/experiment/IExperimentId.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.generic.shared.basic.dto.id.experiment;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.id.IObjectId;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/material/IMaterialId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/material/IMaterialId.java
index a2810c568b6..494aabae76f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/material/IMaterialId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/material/IMaterialId.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.generic.shared.basic.dto.id.material;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.id.IObjectId;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/material/MaterialCodeAndTypeCodeId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/material/MaterialCodeAndTypeCodeId.java
index 5d2a09854d1..509f7e5b115 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/material/MaterialCodeAndTypeCodeId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/material/MaterialCodeAndTypeCodeId.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.generic.shared.basic.dto.id.material;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/material/MaterialTechIdId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/material/MaterialTechIdId.java
index 142a254efbc..721831db8e7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/material/MaterialTechIdId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/material/MaterialTechIdId.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.generic.shared.basic.dto.id.material;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.id.ObjectTechIdId;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/metaproject/IMetaprojectId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/metaproject/IMetaprojectId.java
index fc02c5666be..759af691f68 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/metaproject/IMetaprojectId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/metaproject/IMetaprojectId.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.generic.shared.basic.dto.id.metaproject;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.id.IObjectId;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/metaproject/MetaprojectIdentifierId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/metaproject/MetaprojectIdentifierId.java
index b05510bb7c1..423b350c80c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/metaproject/MetaprojectIdentifierId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/metaproject/MetaprojectIdentifierId.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.generic.shared.basic.dto.id.metaproject;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.MetaprojectIdentifier;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/metaproject/MetaprojectTechIdId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/metaproject/MetaprojectTechIdId.java
index 4050b9a4e4b..52bd3a6b726 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/metaproject/MetaprojectTechIdId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/metaproject/MetaprojectTechIdId.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.generic.shared.basic.dto.id.metaproject;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/project/IProjectId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/project/IProjectId.java
index 4347bd32bff..4aabb009793 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/project/IProjectId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/project/IProjectId.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.generic.shared.basic.dto.id.project;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.id.IObjectId;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/project/ProjectIdentifierId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/project/ProjectIdentifierId.java
index 80a1b49ed21..69f5e6360ac 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/project/ProjectIdentifierId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/project/ProjectIdentifierId.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.generic.shared.basic.dto.id.project;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.id.ObjectIdentifierId;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/project/ProjectPermIdId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/project/ProjectPermIdId.java
index 2732d9d2cbb..e50c3e5318e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/project/ProjectPermIdId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/project/ProjectPermIdId.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.generic.shared.basic.dto.id.project;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.id.ObjectPermIdId;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/project/ProjectTechIdId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/project/ProjectTechIdId.java
index e39460bbf0c..1f90d489c0d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/project/ProjectTechIdId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/project/ProjectTechIdId.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.generic.shared.basic.dto.id.project;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.id.ObjectTechIdId;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/sample/ISampleId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/sample/ISampleId.java
index 4ab4824b78c..9553ca64550 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/sample/ISampleId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/sample/ISampleId.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.generic.shared.basic.dto.id.sample;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.id.IObjectId;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/sample/SampleIdentifierId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/sample/SampleIdentifierId.java
index 00aa04ca864..aae12046cac 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/sample/SampleIdentifierId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/sample/SampleIdentifierId.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.generic.shared.basic.dto.id.sample;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.id.ObjectIdentifierId;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/sample/SamplePermIdId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/sample/SamplePermIdId.java
index 52e783ff5d5..3ae0e11b000 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/sample/SamplePermIdId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/sample/SamplePermIdId.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.generic.shared.basic.dto.id.sample;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.id.ObjectPermIdId;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/sample/SampleTechIdId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/sample/SampleTechIdId.java
index 26201e42e16..cf74ae56b5c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/sample/SampleTechIdId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/sample/SampleTechIdId.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.generic.shared.basic.dto.id.sample;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.id.ObjectTechIdId;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/space/ISpaceId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/space/ISpaceId.java
index a267f2ca8d9..010b1e03c81 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/space/ISpaceId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/space/ISpaceId.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.generic.shared.basic.dto.id.space;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.id.IObjectId;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/space/SpacePermIdId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/space/SpacePermIdId.java
index 6b7cbec465a..a39110e763c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/space/SpacePermIdId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/id/space/SpacePermIdId.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.generic.shared.basic.dto.id.space;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.id.ObjectPermIdId;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/utils/GroupByMap.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/utils/GroupByMap.java
index b9a76a62d30..dc7f46f16b0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/utils/GroupByMap.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/utils/GroupByMap.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.generic.shared.basic.utils;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/utils/IGroupKeyExtractor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/utils/IGroupKeyExtractor.java
index 9dd7d355e61..77a1dab4a99 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/utils/IGroupKeyExtractor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/utils/IGroupKeyExtractor.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.openbis.generic.shared.basic.utils;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/calculator/AbstractCalculator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/calculator/AbstractCalculator.java
index a1ae5dbaa11..c10718402ed 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/calculator/AbstractCalculator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/calculator/AbstractCalculator.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.openbis.generic.shared.calculator;
 
 import java.math.BigInteger;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/calculator/StandardFunctions.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/calculator/StandardFunctions.java
index f2604fdad23..a622f4ba57e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/calculator/StandardFunctions.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/calculator/StandardFunctions.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.generic.shared.calculator;
 
 import java.io.StringReader;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/calculator/customcolumn/CustomColumnJSONBuilder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/calculator/customcolumn/CustomColumnJSONBuilder.java
index 3d9a66f969e..a2c4bedce71 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/calculator/customcolumn/CustomColumnJSONBuilder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/calculator/customcolumn/CustomColumnJSONBuilder.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.generic.shared.calculator.customcolumn;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/calculator/customcolumn/CustomColumnJSONServerData.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/calculator/customcolumn/CustomColumnJSONServerData.java
index feca744312a..27acbff5a88 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/calculator/customcolumn/CustomColumnJSONServerData.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/calculator/customcolumn/CustomColumnJSONServerData.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.generic.shared.calculator.customcolumn;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/cli/OpenBisConsoleClientArguments.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/cli/OpenBisConsoleClientArguments.java
index aaaf809290c..2d8bd9c6813 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/cli/OpenBisConsoleClientArguments.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/cli/OpenBisConsoleClientArguments.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.generic.shared.cli;
 
 import ch.systemsx.cisd.args4j.Option;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/conversation/ServiceConversationApplicationServerClientId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/conversation/ServiceConversationApplicationServerClientId.java
index 6b57c283bc9..2f99b78faf7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/conversation/ServiceConversationApplicationServerClientId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/conversation/ServiceConversationApplicationServerClientId.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.generic.shared.conversation;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/conversation/ServiceConversationApplicationServerUrl.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/conversation/ServiceConversationApplicationServerUrl.java
index 0f35ae74a4b..f14d3e8c5d4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/conversation/ServiceConversationApplicationServerUrl.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/conversation/ServiceConversationApplicationServerUrl.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.generic.shared.conversation;
 
 import ch.systemsx.cisd.openbis.common.api.client.IServicePinger;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/conversation/ServiceConversationDataStoreClientId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/conversation/ServiceConversationDataStoreClientId.java
index 836ff2a0f96..b5f82b33759 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/conversation/ServiceConversationDataStoreClientId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/conversation/ServiceConversationDataStoreClientId.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.generic.shared.conversation;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/conversation/ServiceConversationDataStoreUrl.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/conversation/ServiceConversationDataStoreUrl.java
index 3a3ad07a106..fef00d68c40 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/conversation/ServiceConversationDataStoreUrl.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/conversation/ServiceConversationDataStoreUrl.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.generic.shared.conversation;
 
 import ch.systemsx.cisd.openbis.common.conversation.manager.IServiceConversationClientManagerRemote;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginScanner.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginScanner.java
index 522f2866417..aa5f357dd7b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginScanner.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginScanner.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.generic.shared.coreplugin;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsInjector.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsInjector.java
index 93bd08770d3..ef1d2283b98 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsInjector.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsInjector.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.generic.shared.coreplugin;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsUtils.java
index 407e03181df..23faba35ff4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsUtils.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.generic.shared.coreplugin;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/ICorePluginResourceLoader.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/ICorePluginResourceLoader.java
index 86278784334..9390f8cf802 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/ICorePluginResourceLoader.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/ICorePluginResourceLoader.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.generic.shared.coreplugin;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.CorePlugin;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/IPluginType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/IPluginType.java
index 99215b2121b..0d6a9005afc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/IPluginType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/IPluginType.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.generic.shared.coreplugin;
 
 import java.util.Properties;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/ModuleEnabledChecker.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/ModuleEnabledChecker.java
index 98fe1d60aa3..795ed128bd7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/ModuleEnabledChecker.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/ModuleEnabledChecker.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.generic.shared.coreplugin;
 
 import static ch.systemsx.cisd.openbis.generic.shared.coreplugin.CorePluginsInjector.INITIALIZE_MASTER_DATA_CORE_PLUGIN_NAME;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/PluginType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/PluginType.java
index 0dfddc2dcea..e80b37d59b8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/PluginType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/PluginType.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.generic.shared.coreplugin;
 
 import java.util.Properties;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractDeletedEntityPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractDeletedEntityPE.java
index 992d2db0bb6..a40a490a326 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractDeletedEntityPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractDeletedEntityPE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractEntityHistoryPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractEntityHistoryPE.java
index 298ab9845e2..565e4be2c76 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractEntityHistoryPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractEntityHistoryPE.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.generic.shared.dto;
 
 import javax.persistence.Column;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractEntityPropertyHistoryPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractEntityPropertyHistoryPE.java
index 3454518134f..f4e6046451b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractEntityPropertyHistoryPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractEntityPropertyHistoryPE.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractExpressionPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractExpressionPE.java
index 20d199d9114..eb618b6c9d0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractExpressionPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractExpressionPE.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.openbis.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractGridExpressionPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractGridExpressionPE.java
index da8c3198bb3..3cf7cb3167c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractGridExpressionPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractGridExpressionPE.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.generic.shared.dto;
 
 import javax.persistence.Column;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractIdAndCodeHolder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractIdAndCodeHolder.java
index 117af33140d..38f639d2a0a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractIdAndCodeHolder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractIdAndCodeHolder.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractRegistrationHolder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractRegistrationHolder.java
index 375363c3e9e..52dabefbe6b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractRegistrationHolder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractRegistrationHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractTypePE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractTypePE.java
index 7a92c24c944..93644d1ee9f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractTypePE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractTypePE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import javax.persistence.Column;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AtomicEntityOperationDetails.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AtomicEntityOperationDetails.java
index a7b17cba991..395b43ca8e7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AtomicEntityOperationDetails.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AtomicEntityOperationResult.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AtomicEntityOperationResult.java
index 1301818738c..b60aa4c57be 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AtomicEntityOperationResult.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AtomicEntityOperationResult.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AttachmentContentPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AttachmentContentPE.java
index e1052dd8671..ff3432620a8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AttachmentContentPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AttachmentContentPE.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AttachmentHolderPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AttachmentHolderPE.java
index e5daafa54b7..6d0ae2057ff 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AttachmentHolderPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AttachmentHolderPE.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AttachmentPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AttachmentPE.java
index 346762674ac..bb9c38af809 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AttachmentPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AttachmentPE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AuthorizationGroupPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AuthorizationGroupPE.java
index 4bdfbaf6111..f2d72d38f11 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AuthorizationGroupPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AuthorizationGroupPE.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/Code.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/Code.java
index 5d1c8909b76..6faefa95e75 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/Code.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/Code.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ColumnNames.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ColumnNames.java
index e09b8d0f31a..2f9b5a9623f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ColumnNames.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ColumnNames.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.generic.shared.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ContentCopyPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ContentCopyPE.java
index d2dd64d88dd..cb009fdd1f0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ContentCopyPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ContentCopyPE.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.generic.shared.dto;
 
 import javax.persistence.Column;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/CorePluginPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/CorePluginPE.java
index 1ac165a6327..baf971f20bc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/CorePluginPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/CorePluginPE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.generic.shared.dto;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataPE.java
index cda1c4ae76e..2e876d2da1a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataPE.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.generic.shared.dto;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetAccessPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetAccessPE.java
index f08f5182975..810d4319cf1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetAccessPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetAccessPE.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.generic.shared.dto;
 
 import javax.persistence.Entity;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetBatchUpdatesDTO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetBatchUpdatesDTO.java
index 5451eeacaf4..9234472b7c1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetBatchUpdatesDTO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetBatchUpdatesDTO.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.generic.shared.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.ICodeHolder;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetHistoryPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetHistoryPE.java
index e3192c06ac2..2806f3e8f77 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetHistoryPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetHistoryPE.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.generic.shared.dto;
 
 import javax.persistence.Column;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetPropertyPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetPropertyPE.java
index 083c4670663..e7aee769008 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetPropertyPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetPropertyPE.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.generic.shared.dto;
 
 import javax.persistence.Column;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetRelationshipId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetRelationshipId.java
index c0fa6b007b4..01db47eef8c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetRelationshipId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetRelationshipId.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetRelationshipPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetRelationshipPE.java
index 9925366d742..b0dbc9cb9df 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetRelationshipPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetRelationshipPE.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetShareId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetShareId.java
index b616df6fdaf..850cfef0545 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetShareId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetShareId.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetTypePE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetTypePE.java
index 75072b6cbc7..67f3b188293 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetTypePE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetTypePE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetTypePropertyTypePE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetTypePropertyTypePE.java
index c63919a43fe..5ffc8ab46fc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetTypePropertyTypePE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetTypePropertyTypePE.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.generic.shared.dto;
 
 import javax.persistence.Entity;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetUpdatesDTO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetUpdatesDTO.java
index b12fc190788..c3bed4a199d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetUpdatesDTO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetUpdatesDTO.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.generic.shared.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.BasicDataSetUpdates;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetUploadContext.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetUploadContext.java
index 330a82c8837..b1742bc8060 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetUploadContext.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetUploadContext.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSourceDefinition.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSourceDefinition.java
index e7c7718ba05..60cb689b378 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSourceDefinition.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSourceDefinition.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSourceWithDefinition.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSourceWithDefinition.java
index 64f70bc62ee..1e95a9a3a62 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSourceWithDefinition.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSourceWithDefinition.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.generic.shared.dto;
 
 import javax.sql.DataSource;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataStorePE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataStorePE.java
index 1f4f6149128..22ff37413cf 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataStorePE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataStorePE.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.generic.shared.dto;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataStoreServerInfo.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataStoreServerInfo.java
index 38c1a1135bb..32724e41dd2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataStoreServerInfo.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataStoreServerInfo.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataStoreServicePE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataStoreServicePE.java
index 1e98b59a721..43440bf8d0a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataStoreServicePE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataStoreServicePE.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataTypePE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataTypePE.java
index e331ac58ae5..45855bea59c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataTypePE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataTypePE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DatasetDescription.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DatasetDescription.java
index c132a17ad2f..74e7bb0aa26 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DatasetDescription.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DatasetDescription.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DatastoreServiceDescriptions.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DatastoreServiceDescriptions.java
index 42eff2ab2e8..688f8065755 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DatastoreServiceDescriptions.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DatastoreServiceDescriptions.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedDataPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedDataPE.java
index 855fc10fc0b..7740d4619f4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedDataPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedDataPE.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.generic.shared.dto;
 
 import javax.persistence.Column;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedExperimentPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedExperimentPE.java
index c83aa5148c9..4196052953f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedExperimentPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedExperimentPE.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.generic.shared.dto;
 
 import javax.persistence.Column;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedExternalDataPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedExternalDataPE.java
index 2afecdb74d9..a511e4cd1e8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedExternalDataPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedExternalDataPE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import javax.persistence.Column;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedSamplePE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedSamplePE.java
index 07134b049cc..c166a3ac39f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedSamplePE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedSamplePE.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.generic.shared.dto;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedSampleRelationshipPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedSampleRelationshipPE.java
index 9baf45a6653..e07ced2e156 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedSampleRelationshipPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedSampleRelationshipPE.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletionPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletionPE.java
index 1e94a7678d3..68002454e5f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletionPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletionPE.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityCollectionForCreationOrUpdate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityCollectionForCreationOrUpdate.java
index 70fae40719a..4421f7442c3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityCollectionForCreationOrUpdate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityCollectionForCreationOrUpdate.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityOperationsLogEntryPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityOperationsLogEntryPE.java
index 53d06506ef8..e4befc20c17 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityOperationsLogEntryPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityOperationsLogEntryPE.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.openbis.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityPropertyFiller.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityPropertyFiller.java
index 5deb384f89a..66bfc6d0df4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityPropertyFiller.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityPropertyFiller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityPropertyPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityPropertyPE.java
index ff849441b69..82fdebb6460 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityPropertyPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityPropertyPE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import java.io.StringReader;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityPropertyWithSampleDataTypePE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityPropertyWithSampleDataTypePE.java
index 32461a92c7f..2dbe4e8be1f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityPropertyWithSampleDataTypePE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityPropertyWithSampleDataTypePE.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.systemsx.cisd.openbis.generic.shared.dto;
 
 import javax.persistence.FetchType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityTypePE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityTypePE.java
index aa43d4c2e18..c310833fb02 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityTypePE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityTypePE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityTypePropertyTypePE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityTypePropertyTypePE.java
index 2778f891020..45e3e3f2629 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityTypePropertyTypePE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityTypePropertyTypePE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EventPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EventPE.java
index 759df144dd6..dccbe191c7d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EventPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EventPE.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EventType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EventType.java
index bf5edbb7ed3..457f8b3a4f4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EventType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EventType.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.generic.shared.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EventsSearchPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EventsSearchPE.java
index 9042cf10cba..40e6990613b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EventsSearchPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EventsSearchPE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 ETH Zuerich, CISD
+ * 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.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.generic.shared.dto;
 
 import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentAccessPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentAccessPE.java
index d95f28da821..7c6e6d3541a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentAccessPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentAccessPE.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.generic.shared.dto;
 
 import javax.persistence.Entity;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentBatchUpdatesDTO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentBatchUpdatesDTO.java
index 0678eaed084..2e0bcacf3a3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentBatchUpdatesDTO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentBatchUpdatesDTO.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.generic.shared.dto;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentHistoryPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentHistoryPE.java
index fa4cca4249f..7e46b1ded7a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentHistoryPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentHistoryPE.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.generic.shared.dto;
 
 import javax.persistence.Column;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentPE.java
index 91925b507e3..6c5142f3dd5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentPE.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentPropertyPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentPropertyPE.java
index 09a6a386bcb..c371a6f9306 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentPropertyPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentPropertyPE.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.generic.shared.dto;
 
 import javax.persistence.Column;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentTypePE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentTypePE.java
index a1c2a320d50..e9615b5bad5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentTypePE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentTypePE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentTypePropertyTypePE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentTypePropertyTypePE.java
index 45e2ab51a7d..9f983d497a3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentTypePropertyTypePE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentTypePropertyTypePE.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.generic.shared.dto;
 
 import javax.persistence.Entity;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentUpdatesDTO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentUpdatesDTO.java
index 1e45313ba24..c4a1a63d11c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentUpdatesDTO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentUpdatesDTO.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.generic.shared.dto;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExternalDataManagementSystemPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExternalDataManagementSystemPE.java
index fc727e1e57a..5c12e373c20 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExternalDataManagementSystemPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExternalDataManagementSystemPE.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.generic.shared.dto;
 
 import javax.persistence.Column;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExternalDataPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExternalDataPE.java
index ef70878b08e..863f6a4fedd 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExternalDataPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExternalDataPE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import javax.persistence.Column;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExtractableData.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExtractableData.java
index 838eacbfec0..6e006af871b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExtractableData.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExtractableData.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.generic.shared.dto;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/FileFormatTypePE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/FileFormatTypePE.java
index 7ab86bd7349..1aa4adf33ee 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/FileFormatTypePE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/FileFormatTypePE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import javax.persistence.Entity;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/GridCustomColumnPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/GridCustomColumnPE.java
index c5c5c2d3692..88f34d747c3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/GridCustomColumnPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/GridCustomColumnPE.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.generic.shared.dto;
 
 import javax.persistence.Column;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/GridCustomFilterPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/GridCustomFilterPE.java
index fd96d2a9064..a7264dff926 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/GridCustomFilterPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/GridCustomFilterPE.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.generic.shared.dto;
 
 import javax.persistence.Column;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/HibernateAbstractRegistrationHolder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/HibernateAbstractRegistrationHolder.java
index 75fb68b0e6b..f331e25ffe5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/HibernateAbstractRegistrationHolder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/HibernateAbstractRegistrationHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.IServer;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IAuthSession.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IAuthSession.java
index e72aa0506d0..1030233105b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IAuthSession.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IAuthSession.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IAuthSessionProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IAuthSessionProvider.java
index fc5ea98ee15..1bbf12d2f81 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IAuthSessionProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IAuthSessionProvider.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.openbis.generic.shared.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IDeletablePE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IDeletablePE.java
index 26f36014038..50bc7e00f7c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IDeletablePE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IDeletablePE.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.generic.shared.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.IIdentifierHolder;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityInformationHolderDTO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityInformationHolderDTO.java
index 0b3e4ebcd04..a807a02539b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityInformationHolderDTO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityInformationHolderDTO.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.generic.shared.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.IIdAndCodeHolder;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityInformationWithPropertiesHolder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityInformationWithPropertiesHolder.java
index 081c020ec66..dc84f8cb3be 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityInformationWithPropertiesHolder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityInformationWithPropertiesHolder.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.generic.shared.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.IIdentityHolder;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityPropertiesHolder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityPropertiesHolder.java
index 54346bce7c9..f50ae33191a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityPropertiesHolder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityPropertiesHolder.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.generic.shared.dto;
 
 import java.util.Set;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityPropertyHolder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityPropertyHolder.java
index 5b4f1626822..082bfa1fa65 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityPropertyHolder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityPropertyHolder.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.generic.shared.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.IIdHolder;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityTypePropertyType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityTypePropertyType.java
index 2ec51509ac0..e8a92c35a50 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityTypePropertyType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityTypePropertyType.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.generic.shared.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.IIdHolder;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityWithMetaprojects.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityWithMetaprojects.java
index 67519b9e45a..48d45e65a86 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityWithMetaprojects.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityWithMetaprojects.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.generic.shared.dto;
 
 import java.util.Set;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityWithProperties.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityWithProperties.java
index af0fb8257c9..53d9ce45171 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityWithProperties.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityWithProperties.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.generic.shared.dto;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IIdAndCodeHolder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IIdAndCodeHolder.java
index d4ff71b103f..d22858ea752 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IIdAndCodeHolder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IIdAndCodeHolder.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.generic.shared.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.ICodeHolder;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IMatchingEntity.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IMatchingEntity.java
index 5dd8f95c268..8f7d42401e3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IMatchingEntity.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IMatchingEntity.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.generic.shared.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IModificationDateBean.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IModificationDateBean.java
index eaa77edd7e6..7285d916215 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IModificationDateBean.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IModificationDateBean.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.generic.shared.dto;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IModifierAndModificationDateBean.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IModifierAndModificationDateBean.java
index 0fa55491256..3cd06775a24 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IModifierAndModificationDateBean.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IModifierAndModificationDateBean.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.generic.shared.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IModifierBean.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IModifierBean.java
index 9c0b277a31b..964c4acabd1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IModifierBean.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IModifierBean.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.generic.shared.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IRelatedEntity.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IRelatedEntity.java
index 0b4c6092fea..6f8587cd450 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IRelatedEntity.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IRelatedEntity.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.generic.shared.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IRelatedEntityFinder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IRelatedEntityFinder.java
index 756f55cbfd0..0188aff9a00 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IRelatedEntityFinder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IRelatedEntityFinder.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.generic.shared.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ISampleRelationshipDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ISampleRelationshipDAO.java
index d5ec78c722a..3ba86fc1c1e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ISampleRelationshipDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ISampleRelationshipDAO.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2023 - 2023 Zürich, Scientific 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.generic.shared.dto;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IUntypedValueSetter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IUntypedValueSetter.java
index 2f16fa64a16..1c873030939 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IUntypedValueSetter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IUntypedValueSetter.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.generic.shared.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/Id.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/Id.java
index b59165afc55..dd881244343 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/Id.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/Id.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/LimitFilter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/LimitFilter.java
index 71f99308818..9e6706d55e1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/LimitFilter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/LimitFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/LinkDataPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/LinkDataPE.java
index dd01fd685dc..255eb00302e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/LinkDataPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/LinkDataPE.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.generic.shared.dto;
 
 import java.util.Set;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ListSampleCriteriaDTO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ListSampleCriteriaDTO.java
index 3645a0a1ec9..66aeff37691 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ListSampleCriteriaDTO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ListSampleCriteriaDTO.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ListSamplesByPropertyCriteria.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ListSamplesByPropertyCriteria.java
index fc5b7325e34..ae78d560284 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ListSamplesByPropertyCriteria.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ListSamplesByPropertyCriteria.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/LocationType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/LocationType.java
index 997c64e50d9..7c8248b919f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/LocationType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/LocationType.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.generic.shared.dto;
 
 public enum LocationType
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/LocatorTypePE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/LocatorTypePE.java
index f6d512fb8ca..af4dc17603d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/LocatorTypePE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/LocatorTypePE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import javax.persistence.Entity;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MatchingContentCopy.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MatchingContentCopy.java
index a268811c9a2..8935781d024 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MatchingContentCopy.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MatchingContentCopy.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.generic.shared.dto;
 
 import java.util.regex.Pattern;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPE.java
index 82a167772f0..55c16eb1772 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPE.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPropertyHistoryPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPropertyHistoryPE.java
index 45b877daaeb..ab72b282ba7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPropertyHistoryPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPropertyHistoryPE.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.generic.shared.dto;
 
 import javax.persistence.Entity;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPropertyPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPropertyPE.java
index d26f7e6783e..cbf9bf81882 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPropertyPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPropertyPE.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.generic.shared.dto;
 
 import javax.persistence.Entity;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialTypePE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialTypePE.java
index 79b64179743..620d6da74db 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialTypePE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialTypePE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialTypePropertyTypePE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialTypePropertyTypePE.java
index a7a6a3a3b8b..cf466eab2f6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialTypePropertyTypePE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialTypePropertyTypePE.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.generic.shared.dto;
 
 import javax.persistence.Column;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialUpdateDTO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialUpdateDTO.java
index 130fa311938..d7430e66df6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialUpdateDTO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialUpdateDTO.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MetaprojectAssignmentPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MetaprojectAssignmentPE.java
index 1d8ae962d88..89351ebc65e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MetaprojectAssignmentPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MetaprojectAssignmentPE.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MetaprojectPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MetaprojectPE.java
index 7832d7709a0..56230ca2767 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MetaprojectPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MetaprojectPE.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MetaprojectUpdatesDTO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MetaprojectUpdatesDTO.java
index d100f8841cf..4bd350987cf 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MetaprojectUpdatesDTO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MetaprojectUpdatesDTO.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewContainerDataSet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewContainerDataSet.java
index b713097113d..f26e82445c6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewContainerDataSet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewContainerDataSet.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.generic.shared.dto;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewDataSet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewDataSet.java
index 8563ca095b4..1be984cd1f9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewDataSet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewDataSet.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.generic.shared.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewExternalData.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewExternalData.java
index b73be31302c..54d3e6e0b0c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewExternalData.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewExternalData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewLinkDataSet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewLinkDataSet.java
index d0cbdcfe88f..7bd51034c02 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewLinkDataSet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewLinkDataSet.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.generic.shared.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewProcessingInstruction.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewProcessingInstruction.java
index c2835d11bee..65ae0fed894 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewProcessingInstruction.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewProcessingInstruction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewProperty.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewProperty.java
index 93014437d70..470f52ff0a9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewProperty.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewProperty.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewPropertyType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewPropertyType.java
index 44e7a6de2c1..6950613b1d2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewPropertyType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewPropertyType.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.generic.shared.dto;
 
 import ch.systemsx.cisd.common.parser.BeanProperty;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewRoleAssignment.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewRoleAssignment.java
index 4c6b843dc18..2340e33bd83 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewRoleAssignment.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewRoleAssignment.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewSampleComponent.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewSampleComponent.java
index fb402f4ad23..71d5eff1056 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewSampleComponent.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewSampleComponent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import ch.systemsx.cisd.common.parser.BeanProperty;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewSampleComponentWithFixedMaterialType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewSampleComponentWithFixedMaterialType.java
index fd19e939a7b..1d4195b8ab3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewSampleComponentWithFixedMaterialType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewSampleComponentWithFixedMaterialType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import ch.systemsx.cisd.common.parser.BeanProperty;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewVocabularyTerm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewVocabularyTerm.java
index 3151fd14a1b..1fac0fb639d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewVocabularyTerm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewVocabularyTerm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/OpenBISSessionHolder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/OpenBISSessionHolder.java
index 2b3cf73750f..82282a59d5b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/OpenBISSessionHolder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/OpenBISSessionHolder.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/OperationExecutionAvailability.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/OperationExecutionAvailability.java
index 63db6e96d35..4b795f46093 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/OperationExecutionAvailability.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/OperationExecutionAvailability.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/OperationExecutionPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/OperationExecutionPE.java
index 68761ca703e..1d9cde3d656 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/OperationExecutionPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/OperationExecutionPE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/OperationExecutionState.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/OperationExecutionState.java
index cd13f87f892..8c93d6044fb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/OperationExecutionState.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/OperationExecutionState.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PermId.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PermId.java
index 4787e8463e4..1e104181adb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PermId.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PermId.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PersonDisplaySettingsPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PersonDisplaySettingsPE.java
index b0f35f8061e..c32efa06c25 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PersonDisplaySettingsPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PersonDisplaySettingsPE.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PersonPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PersonPE.java
index 09ae279b93d..f120cda03b5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PersonPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PersonPE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PersonalAccessToken.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PersonalAccessToken.java
index b0341188623..0bf2c2d7fba 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PersonalAccessToken.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PersonalAccessToken.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.generic.shared.dto;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PersonalAccessTokenHash.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PersonalAccessTokenHash.java
index d3115939a25..64e51f58466 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PersonalAccessTokenHash.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PersonalAccessTokenHash.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.generic.shared.dto;
 
 import ch.systemsx.cisd.authentication.SessionTokenHash;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PersonalAccessTokenSession.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PersonalAccessTokenSession.java
index 3981926cea2..2b80ca19197 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PersonalAccessTokenSession.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PersonalAccessTokenSession.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.generic.shared.dto;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PostRegistrationPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PostRegistrationPE.java
index c82d7565e13..547db7ee463 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PostRegistrationPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PostRegistrationPE.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.openbis.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProcessingInstructionDTO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProcessingInstructionDTO.java
index 3aa2f001c7d..643d68c6798 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProcessingInstructionDTO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProcessingInstructionDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProcessingParameters.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProcessingParameters.java
index 24ecca2459c..80685f29dd5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProcessingParameters.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProcessingParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProjectPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProjectPE.java
index dd0339b7e37..1c9bcbc442b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProjectPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProjectPE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProjectUpdatesDTO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProjectUpdatesDTO.java
index fb31f36c145..d12d44e235e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProjectUpdatesDTO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProjectUpdatesDTO.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.generic.shared.dto;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PropertyTypePE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PropertyTypePE.java
index fcde8e89aeb..e10ce239261 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PropertyTypePE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PropertyTypePE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/QueryPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/QueryPE.java
index 4bad47092f8..5f3c8f3a75d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/QueryPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/QueryPE.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.openbis.generic.shared.dto;
 
 import javax.persistence.Column;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelatedDataSet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelatedDataSet.java
index d1c4bbe7fb2..f0d4c81517d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelatedDataSet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelatedDataSet.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.generic.shared.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelatedEntity.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelatedEntity.java
index 454bd7c7e26..7908141429d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelatedEntity.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelatedEntity.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.generic.shared.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelatedExperiment.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelatedExperiment.java
index 8b14a461fef..06013e8d292 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelatedExperiment.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelatedExperiment.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.generic.shared.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelatedExternalDms.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelatedExternalDms.java
index 21be3d2d9bf..445de7ed2a6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelatedExternalDms.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelatedExternalDms.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.generic.shared.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelatedProject.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelatedProject.java
index 5688a5d3055..a32be2934e2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelatedProject.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelatedProject.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.generic.shared.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelatedSample.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelatedSample.java
index 7e1cfa266b3..32c88cb49b1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelatedSample.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelatedSample.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.generic.shared.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelatedSpace.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelatedSpace.java
index dd8cb3c8ab2..8d25d25386c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelatedSpace.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelatedSpace.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.generic.shared.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelationType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelationType.java
index 9618836289a..23bb6e7cf4b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelationType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelationType.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.generic.shared.dto;
 
 import ch.systemsx.cisd.common.shared.basic.string.StringUtils;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelationshipTypePE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelationshipTypePE.java
index fa80cb527e3..bae6e2579de 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelationshipTypePE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RelationshipTypePE.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.generic.shared.dto;
 
 import javax.persistence.Column;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RoleAssignmentPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RoleAssignmentPE.java
index 5d3951d11fc..ecf640de604 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RoleAssignmentPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RoleAssignmentPE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleAccessPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleAccessPE.java
index c80cee206ca..7b1fd802b58 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleAccessPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleAccessPE.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.generic.shared.dto;
 
 import javax.persistence.Entity;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleBatchUpdatesDTO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleBatchUpdatesDTO.java
index dc4127a13b4..998c0dbec20 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleBatchUpdatesDTO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleBatchUpdatesDTO.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.generic.shared.dto;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleHistoryPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleHistoryPE.java
index 813966d205c..f231595f063 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleHistoryPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleHistoryPE.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.generic.shared.dto;
 
 import javax.persistence.Column;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePE.java
index a30ff671d2c..ba2a6b37282 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePE.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleParentWithDerivedDTO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleParentWithDerivedDTO.java
index 798f1dcd00d..fc19aee99c0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleParentWithDerivedDTO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleParentWithDerivedDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePropertyPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePropertyPE.java
index fbe31cecc76..a50820b537f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePropertyPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePropertyPE.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.generic.shared.dto;
 
 import javax.persistence.Column;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleRelationshipPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleRelationshipPE.java
index 93f35ce2cac..b859a205aa3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleRelationshipPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleRelationshipPE.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleRelationshipSkeleton.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleRelationshipSkeleton.java
index ea3c4ef2449..202905cdbec 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleRelationshipSkeleton.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleRelationshipSkeleton.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.generic.shared.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleSkeleton.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleSkeleton.java
index 16a57c23052..412407fb156 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleSkeleton.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleSkeleton.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.generic.shared.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleTypePE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleTypePE.java
index 39d5f5f0cca..b5b425e70e7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleTypePE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleTypePE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleTypePropertyTypePE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleTypePropertyTypePE.java
index 248a1a4c2c4..78d9941fbb0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleTypePropertyTypePE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleTypePropertyTypePE.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.generic.shared.dto;
 
 import javax.persistence.Column;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleUpdatesDTO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleUpdatesDTO.java
index ef762a104ef..8c2eab8a6e5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleUpdatesDTO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SampleUpdatesDTO.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.generic.shared.dto;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ScriptPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ScriptPE.java
index 6556a2e8a40..a78e1b7d3e7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ScriptPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ScriptPE.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.openbis.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SearchableEntity.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SearchableEntity.java
index e6ffd417a7a..34c9c235d44 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SearchableEntity.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SearchableEntity.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.generic.shared.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SemanticAnnotationPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SemanticAnnotationPE.java
index a7874a74ef5..dcb56057a3c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SemanticAnnotationPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SemanticAnnotationPE.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SequenceNames.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SequenceNames.java
index 2ac5a1c7f00..7cd6014ed6b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SequenceNames.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SequenceNames.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.generic.shared.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/Session.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/Session.java
index a9b6962ebbc..f9df46fc993 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/Session.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/Session.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import java.util.LinkedHashSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SessionContextDTO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SessionContextDTO.java
index 038b7102bdd..116bb14f59e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SessionContextDTO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SessionContextDTO.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SimpleDataSetInformationDTO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SimpleDataSetInformationDTO.java
index 1ce5513b430..85f02003244 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SimpleDataSetInformationDTO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SimpleDataSetInformationDTO.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SimpleSession.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SimpleSession.java
index 8035680aa9c..0116234474f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SimpleSession.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SimpleSession.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.generic.shared.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SpacePE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SpacePE.java
index 2e1c83c0aab..d9eacfc4e95 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SpacePE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SpacePE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SpaceRoleAssignment.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SpaceRoleAssignment.java
index f08c2916cfe..8ba73f6f47c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SpaceRoleAssignment.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SpaceRoleAssignment.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/StorageFormat.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/StorageFormat.java
index 8109a009890..462f2797aa7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/StorageFormat.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/StorageFormat.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.generic.shared.dto;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/TableNames.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/TableNames.java
index 0c365ca6e37..56164867612 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/TableNames.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/TableNames.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/TimeInterval.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/TimeInterval.java
index 2b969432b59..28aa96e9037 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/TimeInterval.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/TimeInterval.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ValidationMessages.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ValidationMessages.java
index f6ee09431e0..0c6e2e84212 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ValidationMessages.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ValidationMessages.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.generic.shared.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.BasicConstant;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/VocabularyPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/VocabularyPE.java
index 1861a17017e..24e91e5b423 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/VocabularyPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/VocabularyPE.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/VocabularyTermPE.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/VocabularyTermPE.java
index 73f22943ea8..84d4b60ee1d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/VocabularyTermPE.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/VocabularyTermPE.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/VocabularyTermWithStats.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/VocabularyTermWithStats.java
index e45c6dbf986..3af1d1e8c82 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/VocabularyTermWithStats.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/VocabularyTermWithStats.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/VocabularyUpdatesDTO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/VocabularyUpdatesDTO.java
index 3355def4ce4..d931e938b9a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/VocabularyUpdatesDTO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/VocabularyUpdatesDTO.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.generic.shared.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/AtomicEntityOperationDetailsBuilder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/AtomicEntityOperationDetailsBuilder.java
index ee6eb8c083b..51227ffb6d3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/AtomicEntityOperationDetailsBuilder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/AtomicEntityOperationDetailsBuilder.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.generic.shared.dto.builders;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/exception/UndefinedSpaceException.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/exception/UndefinedSpaceException.java
index 252e810c98a..68cb77ca354 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/exception/UndefinedSpaceException.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/exception/UndefinedSpaceException.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.openbis.generic.shared.dto.exception;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/JsonMapUserType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/JsonMapUserType.java
index 01aaac7223a..16721bf591d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/JsonMapUserType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/JsonMapUserType.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.generic.shared.dto.hibernate;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/JsonPostgreSQLDialect.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/JsonPostgreSQLDialect.java
index e20def2b052..2f77b869978 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/JsonPostgreSQLDialect.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/JsonPostgreSQLDialect.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.systemsx.cisd.openbis.generic.shared.dto.hibernate;
 
 import java.sql.Types;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/Location.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/Location.java
index 23bf12b0e80..e3b67524af4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/Location.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/Location.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.generic.shared.dto.hibernate;
 
 import static java.lang.annotation.ElementType.FIELD;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/LocationValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/LocationValidator.java
index 255ab910d39..926814db216 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/LocationValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/LocationValidator.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.generic.shared.dto.hibernate;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/ManagedInternally.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/ManagedInternally.java
index baffbc17054..f6ae87a52c3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/ManagedInternally.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/ManagedInternally.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.generic.shared.dto.hibernate;
 
 import static java.lang.annotation.ElementType.FIELD;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/ManagedInternallyValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/ManagedInternallyValidator.java
index df78b413217..dccea638d1e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/ManagedInternallyValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/ManagedInternallyValidator.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.generic.shared.dto.hibernate;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/NullBridge.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/NullBridge.java
index 62321584226..91f405b8e8f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/NullBridge.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/NullBridge.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.generic.shared.dto.hibernate;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/SearchFieldConstants.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/SearchFieldConstants.java
index be64421d075..892287c0b8f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/SearchFieldConstants.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/SearchFieldConstants.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.generic.shared.dto.hibernate;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/AbstractIdentifierFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/AbstractIdentifierFactory.java
index 1d9846eef3e..44c9966d2b3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/AbstractIdentifierFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/AbstractIdentifierFactory.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.generic.shared.dto.identifier;
 
 import java.util.regex.Pattern;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/ExperimentIdentifier.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/ExperimentIdentifier.java
index 451f52f8507..c4ab8e5e2ec 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/ExperimentIdentifier.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/ExperimentIdentifier.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.generic.shared.dto.identifier;
 
 import org.apache.commons.lang3.StringUtils;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/ExperimentIdentifierFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/ExperimentIdentifierFactory.java
index 4ad1bb0d8f4..11238388be0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/ExperimentIdentifierFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/ExperimentIdentifierFactory.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.generic.shared.dto.identifier;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/IdentifierHelper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/IdentifierHelper.java
index ff35c48255d..ef253588410 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/IdentifierHelper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/IdentifierHelper.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.generic.shared.dto.identifier;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/LocalExperimentIdentifier.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/LocalExperimentIdentifier.java
index 6190df5f620..460267342c6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/LocalExperimentIdentifier.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/LocalExperimentIdentifier.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.generic.shared.dto.identifier;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/ProjectIdentifier.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/ProjectIdentifier.java
index 68c752077eb..8e41b73d9f2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/ProjectIdentifier.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/ProjectIdentifier.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.generic.shared.dto.identifier;
 
 import org.apache.commons.lang3.StringUtils;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/ProjectIdentifierFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/ProjectIdentifierFactory.java
index 8bc09425dce..9cc0749645d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/ProjectIdentifierFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/ProjectIdentifierFactory.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.generic.shared.dto.identifier;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifier.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifier.java
index 36770f27a61..2a91699861a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifier.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifier.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.generic.shared.dto.identifier;
 
 import ch.systemsx.cisd.openbis.generic.shared.IServer;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifierFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifierFactory.java
index f8a9277890a..87a55021257 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifierFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifierFactory.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.generic.shared.dto.identifier;
 
 import static ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier.CONTAINED_SAMPLE_CODE_SEPARARTOR_STRING;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifierPattern.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifierPattern.java
index 125189636ff..34a625a8aa9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifierPattern.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifierPattern.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.generic.shared.dto.identifier;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleOwnerIdentifier.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleOwnerIdentifier.java
index f5815bf3ae1..a226ba2cbbc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleOwnerIdentifier.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleOwnerIdentifier.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.generic.shared.dto.identifier;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SpaceIdentifier.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SpaceIdentifier.java
index 05baf1c2a18..7420af31d03 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SpaceIdentifier.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SpaceIdentifier.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.generic.shared.dto.identifier;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SpaceIdentifierFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SpaceIdentifierFactory.java
index cc0eefd08ff..f730ffb89d9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SpaceIdentifierFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SpaceIdentifierFactory.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.generic.shared.dto.identifier;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/properties/EntityKind.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/properties/EntityKind.java
index cff4c3f4699..a23e7dbb5a5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/properties/EntityKind.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/properties/EntityKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.dto.properties;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.AbstractEntityPropertyHistoryPE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/types/DataSetTypeCode.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/types/DataSetTypeCode.java
index 5cb4314baf0..c32a61ab754 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/types/DataSetTypeCode.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/types/DataSetTypeCode.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.generic.shared.dto.types;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/types/ExperimentTypeCode.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/types/ExperimentTypeCode.java
index 4486b132661..7ec1162c0a6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/types/ExperimentTypeCode.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/types/ExperimentTypeCode.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.generic.shared.dto.types;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/types/MaterialTypeCode.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/types/MaterialTypeCode.java
index 931ccd20f66..46ffaab263e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/types/MaterialTypeCode.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/types/MaterialTypeCode.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.openbis.generic.shared.dto.types;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/hotdeploy_plugins/AbstractCommonPropertyBasedHotDeployPluginFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/hotdeploy_plugins/AbstractCommonPropertyBasedHotDeployPluginFactory.java
index cb0c0c69dff..082bf0045a5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/hotdeploy_plugins/AbstractCommonPropertyBasedHotDeployPluginFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/hotdeploy_plugins/AbstractCommonPropertyBasedHotDeployPluginFactory.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.generic.shared.hotdeploy_plugins;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/hotdeploy_plugins/ICommonPropertyBasedHotDeployPluginFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/hotdeploy_plugins/ICommonPropertyBasedHotDeployPluginFactory.java
index c06f065d142..1cad53f9264 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/hotdeploy_plugins/ICommonPropertyBasedHotDeployPluginFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/hotdeploy_plugins/ICommonPropertyBasedHotDeployPluginFactory.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.generic.shared.hotdeploy_plugins;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/hotdeploy_plugins/api/ICommonPropertyBasedHotDeployPlugin.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/hotdeploy_plugins/api/ICommonPropertyBasedHotDeployPlugin.java
index dd4494ceeab..a4d8570d850 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/hotdeploy_plugins/api/ICommonPropertyBasedHotDeployPlugin.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/hotdeploy_plugins/api/ICommonPropertyBasedHotDeployPlugin.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.generic.shared.hotdeploy_plugins.api;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/hotdeploy_plugins/api/IEntityAdaptor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/hotdeploy_plugins/api/IEntityAdaptor.java
index 76129bea3aa..174127683f1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/hotdeploy_plugins/api/IEntityAdaptor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/hotdeploy_plugins/api/IEntityAdaptor.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.generic.shared.hotdeploy_plugins.api;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/hotdeploy_plugins/api/IEntityPropertyAdaptor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/hotdeploy_plugins/api/IEntityPropertyAdaptor.java
index 8cbfb133b85..c5dd228894a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/hotdeploy_plugins/api/IEntityPropertyAdaptor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/hotdeploy_plugins/api/IEntityPropertyAdaptor.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.generic.shared.hotdeploy_plugins.api;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/EntityLinkElementTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/EntityLinkElementTranslator.java
index 2453015b705..f25d0162ec8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/EntityLinkElementTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/EntityLinkElementTranslator.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.generic.shared.managed_property;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/IAtomicEvaluation.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/IAtomicEvaluation.java
index ad000a97f73..b211e7e9ec1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/IAtomicEvaluation.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/IAtomicEvaluation.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.generic.shared.managed_property;
 
 import ch.systemsx.cisd.common.jython.evaluator.IJythonEvaluator;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/IEvaluationRunner.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/IEvaluationRunner.java
index 0ff971f17b5..df512072caa 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/IEvaluationRunner.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/IEvaluationRunner.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.generic.shared.managed_property;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/IManagedPropertyEvaluatorFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/IManagedPropertyEvaluatorFactory.java
index f6a86aba719..0b18a40c405 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/IManagedPropertyEvaluatorFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/IManagedPropertyEvaluatorFactory.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.generic.shared.managed_property;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityTypePropertyType;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/JythonManagedPropertyEvaluator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/JythonManagedPropertyEvaluator.java
index 30fe43f3b9c..e256b5ea579 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/JythonManagedPropertyEvaluator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/JythonManagedPropertyEvaluator.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.generic.shared.managed_property;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/ManagedPropertyEvaluatorFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/ManagedPropertyEvaluatorFactory.java
index fcd73812eb2..f56ca4f6a07 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/ManagedPropertyEvaluatorFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/ManagedPropertyEvaluatorFactory.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.generic.shared.managed_property;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/ManagedPropertyFunctions.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/ManagedPropertyFunctions.java
index 4022428660b..1e63fad8cd9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/ManagedPropertyFunctions.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/ManagedPropertyFunctions.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.generic.shared.managed_property;
 
 import javax.annotation.Resource;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/SimpleTableModelBuilderAdaptor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/SimpleTableModelBuilderAdaptor.java
index d058fb07638..7784b87cf6b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/SimpleTableModelBuilderAdaptor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/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.generic.shared.managed_property;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/EntityLinkElementKind.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/EntityLinkElementKind.java
index 7aa03d27b32..85e1c1b91a9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/EntityLinkElementKind.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/EntityLinkElementKind.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.generic.shared.managed_property.api;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IElement.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IElement.java
index 091b1b1d2dc..c5a59356604 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IElement.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IElement.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.generic.shared.managed_property.api;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IElementFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IElementFactory.java
index 207e56b7876..ed76c728129 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IElementFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IElementFactory.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.generic.shared.managed_property.api;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IEntityInformationProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IEntityInformationProvider.java
index 90b0ebd3613..adff71d8a3a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IEntityInformationProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IEntityInformationProvider.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.generic.shared.managed_property.api;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IEntityLinkElement.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IEntityLinkElement.java
index 9aed6a98b70..75e5a7943c8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IEntityLinkElement.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IEntityLinkElement.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.generic.shared.managed_property.api;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IManagedPropertyEvaluator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IManagedPropertyEvaluator.java
index 3dc3e401808..dd22f47d5d3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IManagedPropertyEvaluator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IManagedPropertyEvaluator.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.generic.shared.managed_property.api;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IManagedPropertyHotDeployEvaluator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IManagedPropertyHotDeployEvaluator.java
index 00c4e10bcd8..a0b2f9da8ef 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IManagedPropertyHotDeployEvaluator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IManagedPropertyHotDeployEvaluator.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.generic.shared.managed_property.api;
 
 import ch.systemsx.cisd.openbis.generic.shared.hotdeploy_plugins.api.ICommonPropertyBasedHotDeployPlugin;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IRowBuilderAdaptor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IRowBuilderAdaptor.java
index a72f4d0d731..e84ea448162 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IRowBuilderAdaptor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IRowBuilderAdaptor.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.generic.shared.managed_property.api;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/ISimpleTableModelBuilderAdaptor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/ISimpleTableModelBuilderAdaptor.java
index a706c58bba8..669b31dee9e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/ISimpleTableModelBuilderAdaptor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/ISimpleTableModelBuilderAdaptor.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.generic.shared.managed_property.api;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IStructuredPropertyConverter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IStructuredPropertyConverter.java
index 227d83a422b..c326ff8c618 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IStructuredPropertyConverter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/api/IStructuredPropertyConverter.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.generic.shared.managed_property.api;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/Element.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/Element.java
index 75e00a3955a..a06b799fb2f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/Element.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/Element.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.generic.shared.managed_property.structured;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/ElementFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/ElementFactory.java
index 9152f11a2e0..050cbc056b2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/ElementFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/ElementFactory.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.generic.shared.managed_property.structured;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.MaterialIdentifier;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/EntityLinkElement.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/EntityLinkElement.java
index 9411765ae3e..3e7c0f35ee7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/EntityLinkElement.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/EntityLinkElement.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.generic.shared.managed_property.structured;
 
 import ch.systemsx.cisd.openbis.generic.shared.managed_property.api.EntityLinkElementKind;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/JsonStructuredPropertyConverter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/JsonStructuredPropertyConverter.java
index 944d407cf6c..2b15d8acf04 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/JsonStructuredPropertyConverter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/JsonStructuredPropertyConverter.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.generic.shared.managed_property.structured;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/XmlOrJsonStructuredPropertyConverter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/XmlOrJsonStructuredPropertyConverter.java
index cdc8bd8a825..7d2464c8c2d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/XmlOrJsonStructuredPropertyConverter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/XmlOrJsonStructuredPropertyConverter.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.generic.shared.managed_property.structured;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/XmlStructuredPropertyConverter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/XmlStructuredPropertyConverter.java
index bb7e9476a61..c8e8e17d01f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/XmlStructuredPropertyConverter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/XmlStructuredPropertyConverter.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.generic.shared.managed_property.structured;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/BisExcelFileLoader.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/BisExcelFileLoader.java
index f0159c65f3b..a575d65a16a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/BisExcelFileLoader.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/BisExcelFileLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.parser;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/BisTabFileLoader.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/BisTabFileLoader.java
index d67b040411f..636c398f469 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/BisTabFileLoader.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/BisTabFileLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.shared.parser;
 
 import java.io.Reader;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/ExcelFileSection.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/ExcelFileSection.java
index 8f8282d67b6..07c023856b9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/ExcelFileSection.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/ExcelFileSection.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.generic.shared.parser;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/FileSection.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/FileSection.java
index 307f16bc529..281506b8766 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/FileSection.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/FileSection.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.generic.shared.parser;
 
 import java.io.InputStream;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/GlobalProperties.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/GlobalProperties.java
index 36e14c0f72f..3bd3835ac85 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/GlobalProperties.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/GlobalProperties.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.generic.shared.parser;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/GlobalPropertiesLoader.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/GlobalPropertiesLoader.java
index b56439a6d9e..bd947d97cfb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/GlobalPropertiesLoader.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/GlobalPropertiesLoader.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.generic.shared.parser;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/NamedInputStream.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/NamedInputStream.java
index 81ef600e0df..e2e18d73d7f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/NamedInputStream.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/NamedInputStream.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.generic.shared.parser;
 
 import java.io.InputStream;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/NewSampleParserObjectFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/NewSampleParserObjectFactory.java
index ff6a7cbee49..4d16e4c4fbb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/NewSampleParserObjectFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/NewSampleParserObjectFactory.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.generic.shared.parser;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/SampleUploadSectionsParser.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/SampleUploadSectionsParser.java
index 0f9f41f3ef9..9c5f43dfecc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/SampleUploadSectionsParser.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/SampleUploadSectionsParser.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.generic.shared.parser;
 
 import java.io.Reader;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/UpdatedSampleParserObjectFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/UpdatedSampleParserObjectFactory.java
index 8210dca8d28..799ff310484 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/UpdatedSampleParserObjectFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/parser/UpdatedSampleParserObjectFactory.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.generic.shared.parser;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/pat/AbstractPersonalAccessTokenConverter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/pat/AbstractPersonalAccessTokenConverter.java
index 8c314f6f4c0..10ec5b332b2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/pat/AbstractPersonalAccessTokenConverter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/pat/AbstractPersonalAccessTokenConverter.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.generic.shared.pat;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/pat/IPersonalAccessTokenConfig.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/pat/IPersonalAccessTokenConfig.java
index ca6ae45ac03..ed8e1ce9a33 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/pat/IPersonalAccessTokenConfig.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/pat/IPersonalAccessTokenConfig.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.generic.shared.pat;
 
 public interface IPersonalAccessTokenConfig
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/pat/IPersonalAccessTokenConverter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/pat/IPersonalAccessTokenConverter.java
index 1ffad31153e..b1625758062 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/pat/IPersonalAccessTokenConverter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/pat/IPersonalAccessTokenConverter.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.generic.shared.pat;
 
 public interface IPersonalAccessTokenConverter
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/pat/PersonalAccessTokenConstants.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/pat/PersonalAccessTokenConstants.java
index a217064d9ae..62eb13e62f8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/pat/PersonalAccessTokenConstants.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/pat/PersonalAccessTokenConstants.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.generic.shared.pat;
 
 public class PersonalAccessTokenConstants
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/AbstractEntityTypePropertyTypeTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/AbstractEntityTypePropertyTypeTranslator.java
index ebfd394910f..c483786d85b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/AbstractEntityTypePropertyTypeTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/AbstractEntityTypePropertyTypeTranslator.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.generic.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/AttachmentTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/AttachmentTranslator.java
index a9c7d8e3df9..272daa59577 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/AttachmentTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/AttachmentTranslator.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.generic.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/AuthorizationGroupTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/AuthorizationGroupTranslator.java
index 0221efcf30a..2359f9743f1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/AuthorizationGroupTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/AuthorizationGroupTranslator.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.generic.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/CorePluginTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/CorePluginTranslator.java
index cc5e938ed93..37cbdde4071 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/CorePluginTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/CorePluginTranslator.java
@@ -1,6 +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.
@@ -14,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.generic.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTranslator.java
index 498b93be9c0..35186d452f5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTranslator.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.generic.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTypePropertyTypeTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTypePropertyTypeTranslator.java
index 6bc057a0652..23ab0b3a57d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTypePropertyTypeTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTypePropertyTypeTranslator.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.generic.shared.translator;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTypeTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTypeTranslator.java
index af8d1da1a70..8c1afbcc0ee 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTypeTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTypeTranslator.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.generic.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataStoreServiceTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataStoreServiceTranslator.java
index 73a60916ecb..652b612bf4a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataStoreServiceTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataStoreServiceTranslator.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.generic.shared.translator;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Code;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataStoreTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataStoreTranslator.java
index 90f31d6eb3b..5ede8789c0c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataStoreTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataStoreTranslator.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.generic.shared.translator;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.GenericSharedConstants.DATA_STORE_SERVER_WEB_APPLICATION_NAME;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataTypeTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataTypeTranslator.java
index 81da388dd27..6aefbe200c2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataTypeTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataTypeTranslator.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.generic.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DatabaseInstanceTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DatabaseInstanceTranslator.java
index ed125e1032c..560302cfd78 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DatabaseInstanceTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DatabaseInstanceTranslator.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.generic.shared.translator;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseInstance;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DeletedEntityTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DeletedEntityTranslator.java
index bfa44516093..0c9ebfa979b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DeletedEntityTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DeletedEntityTranslator.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.generic.shared.translator;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DeletionTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DeletionTranslator.java
index 6973d5d311f..f77384cf365 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DeletionTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DeletionTranslator.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.generic.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DtoConverters.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DtoConverters.java
index e26509a9784..d2f7a9a5e40 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DtoConverters.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DtoConverters.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.generic.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/EntityHistoryTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/EntityHistoryTranslator.java
index d2d38bba85a..2660797e711 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/EntityHistoryTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/EntityHistoryTranslator.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.generic.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/EntityPropertyTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/EntityPropertyTranslator.java
index 02ad0702a9d..39cd5d4fc12 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/EntityPropertyTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/EntityPropertyTranslator.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.generic.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/EntityTypeTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/EntityTypeTranslator.java
index 016f42f8d30..6e59d9b07e6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/EntityTypeTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/EntityTypeTranslator.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.generic.shared.translator;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTranslator.java
index 4fc95389492..f321a8218eb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTranslator.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.generic.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTypePropertyTypeTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTypePropertyTypeTranslator.java
index ebfecc353c8..a3ea9192085 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTypePropertyTypeTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTypePropertyTypeTranslator.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.generic.shared.translator;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTypeTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTypeTranslator.java
index 0e4c8bdc3ae..e3fcfd28cfe 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTypeTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTypeTranslator.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.generic.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExternalDataManagementSystemTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExternalDataManagementSystemTranslator.java
index 1bf87df8be4..4fd354f3ec3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExternalDataManagementSystemTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExternalDataManagementSystemTranslator.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.generic.shared.translator;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalDataManagementSystem;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/GridCustomExpressionTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/GridCustomExpressionTranslator.java
index 8b96582ca45..953a7abb12c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/GridCustomExpressionTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/GridCustomExpressionTranslator.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.generic.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/MaterialTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/MaterialTranslator.java
index ad8efddccd7..bba2845e57f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/MaterialTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/MaterialTranslator.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.generic.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/MaterialTypePropertyTypeTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/MaterialTypePropertyTypeTranslator.java
index a0dd314c9d6..b0d5b31ca71 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/MaterialTypePropertyTypeTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/MaterialTypePropertyTypeTranslator.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.generic.shared.translator;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/MaterialTypeTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/MaterialTypeTranslator.java
index 8e43b61f779..5a482ba3a1d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/MaterialTypeTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/MaterialTypeTranslator.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.generic.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/MetaprojectTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/MetaprojectTranslator.java
index 9304b8f805b..a20fb379c52 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/MetaprojectTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/MetaprojectTranslator.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.generic.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PersonRolesTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PersonRolesTranslator.java
index 36c84e56592..21bb7765ed5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PersonRolesTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PersonRolesTranslator.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.generic.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PersonTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PersonTranslator.java
index 44a1c0df440..20a441aa544 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PersonTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PersonTranslator.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.generic.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ProjectTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ProjectTranslator.java
index e179e0869a5..785baa45106 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ProjectTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ProjectTranslator.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.generic.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PropertyTranslatorUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PropertyTranslatorUtils.java
index f0076b1e8ee..b05847f45ba 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PropertyTranslatorUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PropertyTranslatorUtils.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.generic.shared.translator;
 
 import ch.systemsx.cisd.common.jython.evaluator.EvaluatorException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PropertyTypeTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PropertyTypeTranslator.java
index fae5392f584..b6eb095db19 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PropertyTypeTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PropertyTypeTranslator.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.generic.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/RoleAssignmentTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/RoleAssignmentTranslator.java
index 711a16a3a45..6b023eaeade 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/RoleAssignmentTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/RoleAssignmentTranslator.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.generic.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SampleTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SampleTranslator.java
index 95b71bf6408..b27b344493f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SampleTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SampleTranslator.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.generic.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SampleTypePropertyTypeTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SampleTypePropertyTypeTranslator.java
index e035730dea5..c49a3678eb3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SampleTypePropertyTypeTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SampleTypePropertyTypeTranslator.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.generic.shared.translator;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SampleTypeTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SampleTypeTranslator.java
index 93cbd6f5795..cdba9bcc28a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SampleTypeTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SampleTypeTranslator.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.generic.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ScriptTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ScriptTranslator.java
index 25f24eb575e..35ba84e7779 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ScriptTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ScriptTranslator.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.generic.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SimpleDataSetHelper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SimpleDataSetHelper.java
index 37d4e13b1ad..3d7f9e27544 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SimpleDataSetHelper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SimpleDataSetHelper.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.generic.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SpaceTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SpaceTranslator.java
index 69cc170dbb3..427c0568495 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SpaceTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SpaceTranslator.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.generic.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/TypeTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/TypeTranslator.java
index 3fe49902717..d1520aa1283 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/TypeTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/TypeTranslator.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.generic.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/VocabularyTermTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/VocabularyTermTranslator.java
index 2ef7423e442..b9ba20b850a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/VocabularyTermTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/VocabularyTermTranslator.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.generic.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/VocabularyTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/VocabularyTranslator.java
index 44423e0aad6..c8cc339a36e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/VocabularyTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/VocabularyTranslator.java
@@ -1,6 +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.
@@ -14,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.generic.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/CacheManager.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/CacheManager.java
index add01d7d96b..cc6da9a6ee3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/CacheManager.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/CacheManager.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.generic.shared.util;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/DataTypeUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/DataTypeUtils.java
index 1fa95b23801..a2bbfc041d9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/DataTypeUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/DataTypeUtils.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.generic.shared.util;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/DatabaseInstanceIdentifierHelper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/DatabaseInstanceIdentifierHelper.java
index 637041644ac..b33ff981258 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/DatabaseInstanceIdentifierHelper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/DatabaseInstanceIdentifierHelper.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.generic.shared.util;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/DisplaySettingsSerializationUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/DisplaySettingsSerializationUtils.java
index 6d4724d8a07..aebdc8c5d52 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/DisplaySettingsSerializationUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/DisplaySettingsSerializationUtils.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.generic.shared.util;
 
 import java.io.ByteArrayInputStream;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/EntityHelper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/EntityHelper.java
index b1927134608..8c2ff7e7554 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/EntityHelper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/EntityHelper.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.generic.shared.util;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/EodSqlUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/EodSqlUtils.java
index 663471efac1..328f9091329 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/EodSqlUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/EodSqlUtils.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.generic.shared.util;
 
 import java.lang.reflect.Field;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/EqualsHashUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/EqualsHashUtils.java
index 8ce547af84e..22c88f16a9f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/EqualsHashUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/EqualsHashUtils.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.generic.shared.util;
 
 import ch.systemsx.cisd.common.reflection.MethodUtils;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/HibernateUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/HibernateUtils.java
index a3b07878e02..3d88131997a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/HibernateUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/HibernateUtils.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.generic.shared.util;
 
 import org.hibernate.CacheMode;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/HttpRequestUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/HttpRequestUtils.java
index d75088c03a4..f8e286a40b1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/HttpRequestUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/HttpRequestUtils.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.generic.shared.util;
 
 import javax.servlet.http.HttpServletResponse;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/ICacheManager.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/ICacheManager.java
index 365d47a8adb..c87704dc189 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/ICacheManager.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/ICacheManager.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.generic.shared.util;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/IColumn.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/IColumn.java
index b406f77f6d2..991f03d536a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/IColumn.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/IColumn.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.generic.shared.util;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/IColumnGroup.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/IColumnGroup.java
index 19a84397e4f..07cb7ba2c72 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/IColumnGroup.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/IColumnGroup.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.generic.shared.util;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/IColumnMetaData.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/IColumnMetaData.java
index b6525994f06..3c3a894379a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/IColumnMetaData.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/IColumnMetaData.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.generic.shared.util;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataTypeCode;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/IDataSourceFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/IDataSourceFactory.java
index aaadf5d8b71..410c3cbfbfe 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/IDataSourceFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/IDataSourceFactory.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.
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/IRowBuilder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/IRowBuilder.java
index 428a2659ac6..4a8ce70b5c9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/IRowBuilder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/IRowBuilder.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.generic.shared.util;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/Key.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/Key.java
index 14fbd6c6714..a6f9c10be66 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/Key.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/Key.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.generic.shared.util;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/MaterialConfigurationProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/MaterialConfigurationProvider.java
index 66da13ffdd3..814ded48712 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/MaterialConfigurationProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/MaterialConfigurationProvider.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.generic.shared.util;
 
 import ch.systemsx.cisd.common.properties.PropertyUtils;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/RelationshipUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/RelationshipUtils.java
index e8038f1ba31..1aec1bda42f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/RelationshipUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/RelationshipUtils.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.generic.shared.util;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/RuntimeCache.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/RuntimeCache.java
index 24bdbff2bc4..112a667375f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/RuntimeCache.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/RuntimeCache.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.generic.shared.util;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/RuntimeCacheEventListener.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/RuntimeCacheEventListener.java
index bf7232ee3b3..9f5c175c3b1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/RuntimeCacheEventListener.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/RuntimeCacheEventListener.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.generic.shared.util;
 
 import net.sf.ehcache.CacheException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/RuntimeCacheEventListenerFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/RuntimeCacheEventListenerFactory.java
index 21d5f88c5cb..971a66e2950 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/RuntimeCacheEventListenerFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/RuntimeCacheEventListenerFactory.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.openbis.generic.shared.util;
 
 import java.util.Properties;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/ServerUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/ServerUtils.java
index 700470d003d..cddb3ff9ec8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/ServerUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/ServerUtils.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.generic.shared.util;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/SimplePropertyValidator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/SimplePropertyValidator.java
index e9cbd6014b0..36518c41550 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/SimplePropertyValidator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/SimplePropertyValidator.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.generic.shared.util;
 
 import java.text.ParseException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/SimpleTableModelBuilder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/SimpleTableModelBuilder.java
index 077b008c0f7..68be9567a88 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/SimpleTableModelBuilder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/SimpleTableModelBuilder.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.generic.shared.util;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/SpaceCodeHelper.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/SpaceCodeHelper.java
index 8c234210f23..7f420d4667e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/SpaceCodeHelper.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/SpaceCodeHelper.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.generic.shared.util;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/StopWatchLogger.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/StopWatchLogger.java
index 4a5f2d67940..708e3940b54 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/StopWatchLogger.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/StopWatchLogger.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.generic.shared.util;
 
 import org.apache.commons.lang3.time.StopWatch;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/TypedTableModelBuilder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/TypedTableModelBuilder.java
index a6b401f32ba..e2744133a62 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/TypedTableModelBuilder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/TypedTableModelBuilder.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.generic.shared.util;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/UuidUtil.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/UuidUtil.java
index fd5671fce8a..c4057a13fd7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/UuidUtil.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/UuidUtil.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.generic.shared.util;
 
 import java.util.UUID;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/WebClientConfigUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/WebClientConfigUtils.java
index 2de94d5d719..c1b5fdc0627 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/WebClientConfigUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/WebClientConfigUtils.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.generic.shared.util;
 
 import ch.systemsx.cisd.openbis.generic.shared.WebClientConfigurationProvider;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/WebClientFilesUpdater.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/WebClientFilesUpdater.java
index 895960dd6fb..ff1b31daaf6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/WebClientFilesUpdater.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/WebClientFilesUpdater.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.generic.shared.util;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/XmlUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/XmlUtils.java
index eaaff27a0c3..a69df4c6c2f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/XmlUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/shared/util/XmlUtils.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.generic.shared.util;
 
 import java.io.File;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/AbstractPluginBusinessObjectFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/AbstractPluginBusinessObjectFactory.java
index ad8d343de94..2de484265ed 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/AbstractPluginBusinessObjectFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/AbstractPluginBusinessObjectFactory.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.plugin;
 
 import javax.annotation.Resource;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/AbstractSampleServerPlugin.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/AbstractSampleServerPlugin.java
index 31df2e3f656..c34fd12d73d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/AbstractSampleServerPlugin.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/AbstractSampleServerPlugin.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.plugin;
 
 import javax.annotation.Resource;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/IDemoClientService.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/IDemoClientService.java
index 9755c1e350e..e9543b075cb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/IDemoClientService.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/IDemoClientService.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.plugin.demo.client.web.client;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.IClientService;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/IDemoClientServiceAsync.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/IDemoClientServiceAsync.java
index 18eb6c1f7b3..4f1a7463a3d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/IDemoClientServiceAsync.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/IDemoClientServiceAsync.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.plugin.demo.client.web.client;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/ClientPluginFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/ClientPluginFactory.java
index 07faf80dca8..890d4068bb4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/ClientPluginFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/ClientPluginFactory.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.plugin.demo.client.web.client.application;
 
 import java.util.Collections;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/DemoSampleViewer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/DemoSampleViewer.java
index c5ccb2bce07..46bbd18aa24 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/DemoSampleViewer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/DemoSampleViewer.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.plugin.demo.client.web.client.application;
 
 import com.google.gwt.user.client.ui.Widget;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/DemoViewContext.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/DemoViewContext.java
index 48a89062c80..ee92b25dd31 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/DemoViewContext.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/DemoViewContext.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.plugin.demo.client.web.client.application;
 
 import com.google.gwt.core.client.GWT;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/Dict.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/Dict.java
index 304ed432c8d..22343a622ea 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/Dict.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/Dict.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.plugin.demo.client.web.client.application;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/module/CustomizedWidgetDemoModuleMenu.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/module/CustomizedWidgetDemoModuleMenu.java
index 270ec89f99a..353bc277e39 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/module/CustomizedWidgetDemoModuleMenu.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/module/CustomizedWidgetDemoModuleMenu.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.plugin.demo.client.web.client.application.module;
 
 import com.extjs.gxt.ui.client.event.ComponentEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/module/DemoModule.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/module/DemoModule.java
index 869a9738d0f..5dd1bb1e5ac 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/module/DemoModule.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/module/DemoModule.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.plugin.demo.client.web.client.application.module;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/module/StatisticsWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/module/StatisticsWidget.java
index 1d68fb79aee..755a6acb93b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/module/StatisticsWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/module/StatisticsWidget.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.plugin.demo.client.web.client.application.module;
 
 import java.util.Set;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/module/TopMenuItemDemoModuleMenu.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/module/TopMenuItemDemoModuleMenu.java
index 906526a8489..aaffa121c47 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/module/TopMenuItemDemoModuleMenu.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/module/TopMenuItemDemoModuleMenu.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.plugin.demo.client.web.client.application.module;
 
 import com.extjs.gxt.ui.client.widget.menu.Menu;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/server/DemoClientService.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/server/DemoClientService.java
index 8fb37705039..0274d8d693f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/server/DemoClientService.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/server/DemoClientService.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.plugin.demo.client.web.server;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/server/DemoClientServiceServlet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/server/DemoClientServiceServlet.java
index dda45acb21e..c97abd1c3ca 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/server/DemoClientServiceServlet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/server/DemoClientServiceServlet.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.plugin.demo.client.web.server;
 
 import javax.annotation.Resource;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoBusinessObjectFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoBusinessObjectFactory.java
index a660428e3ee..a419e01644d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoBusinessObjectFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoBusinessObjectFactory.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.plugin.demo.server;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoSampleServerPlugin.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoSampleServerPlugin.java
index 083cb72b73d..03be4c5ea62 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoSampleServerPlugin.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoSampleServerPlugin.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.plugin.demo.server;
 
 import java.util.Collections;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServer.java
index bb4e784e2d7..771cf8d40fb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServer.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.plugin.demo.server;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServerLogger.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServerLogger.java
index 41233d26873..ff621e56d4e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServerLogger.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServerLogger.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.plugin.demo.server;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/IDemoBusinessObjectFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/IDemoBusinessObjectFactory.java
index 67c7eb0c31c..0546c02d8dc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/IDemoBusinessObjectFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/server/IDemoBusinessObjectFactory.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.plugin.demo.server;
 
 import ch.systemsx.cisd.openbis.generic.server.business.bo.ISampleBO;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/shared/IDemoServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/shared/IDemoServer.java
index d4bf8c7ba5a..df6ee6b42bd 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/shared/IDemoServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/shared/IDemoServer.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.plugin.demo.shared;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/shared/ResourceNames.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/shared/ResourceNames.java
index 9c050fd6205..1ce481b561b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/shared/ResourceNames.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/demo/shared/ResourceNames.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.plugin.demo.shared;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/IGenericClientService.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/IGenericClientService.java
index a5d485ae2e9..efbadf8ee8c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/IGenericClientService.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/IGenericClientService.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.plugin.generic.client.web.client;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/IGenericClientServiceAsync.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/IGenericClientServiceAsync.java
index 8b37e0012d7..cea8755f8c5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/IGenericClientServiceAsync.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/IGenericClientServiceAsync.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.plugin.generic.client.web.client;
 
 import java.util.Date;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/AbstractEntityDataSetsSection.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/AbstractEntityDataSetsSection.java
index 95cd0df77cf..7f26c7e0579 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/AbstractEntityDataSetsSection.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/AbstractEntityDataSetsSection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.plugin.generic.client.web.client.application;
 
 import com.extjs.gxt.ui.client.event.SelectionChangedEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/AbstractGenericEntityRegistrationForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/AbstractGenericEntityRegistrationForm.java
index 909960e837a..3cda44fae9b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/AbstractGenericEntityRegistrationForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/AbstractGenericEntityRegistrationForm.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.plugin.generic.client.web.client.application;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/ClientPluginFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/ClientPluginFactory.java
index f57899f329c..dcf00624bb7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/ClientPluginFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/ClientPluginFactory.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.plugin.generic.client.web.client.application;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/DelegatedClientPlugin.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/DelegatedClientPlugin.java
index 051ba0bec79..4196adf61aa 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/DelegatedClientPlugin.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/DelegatedClientPlugin.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.plugin.generic.client.web.client.application;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/GeneralImportForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/GeneralImportForm.java
index 704207bb5e4..6cbdeb047d2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/GeneralImportForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/GeneralImportForm.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.plugin.generic.client.web.client.application;
 
 import com.extjs.gxt.ui.client.widget.form.LabelField;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/GenericViewContext.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/GenericViewContext.java
index 7022a06999a..a45c283bcc5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/GenericViewContext.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/GenericViewContext.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2008 - 2023 Zürich, Scientific 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.plugin.generic.client.web.client.application;
 
 import com.google.gwt.core.client.GWT;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/PropertiesPanelUtils.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/PropertiesPanelUtils.java
index da6f5db4ae9..c7b7313b835 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/PropertiesPanelUtils.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/PropertiesPanelUtils.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.plugin.generic.client.web.client.application;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/AbstractDataSetsSection.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/AbstractDataSetsSection.java
index 317887b8158..e97b988e3b1 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/AbstractDataSetsSection.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/AbstractDataSetsSection.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.openbis.plugin.generic.client.web.client.application.dataset;
 
 import com.extjs.gxt.ui.client.event.SelectionChangedListener;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetChildrenSection.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetChildrenSection.java
index a834367355e..9e4b72cd80c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetChildrenSection.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetChildrenSection.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.plugin.generic.client.web.client.application.dataset;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetContainedSection.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetContainedSection.java
index 256239450fe..fa34ca42378 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetContainedSection.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetContainedSection.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.plugin.generic.client.web.client.application.dataset;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetContainerSection.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetContainerSection.java
index c83bdefef1e..74cf287ac64 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetContainerSection.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetContainerSection.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.plugin.generic.client.web.client.application.dataset;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetParentsSection.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetParentsSection.java
index e9f42ef2a9f..b9b0455fc37 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetParentsSection.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetParentsSection.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.plugin.generic.client.web.client.application.dataset;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetPropertiesPanel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetPropertiesPanel.java
index a51f675cec0..54f03600a8d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetPropertiesPanel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetPropertiesPanel.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.plugin.generic.client.web.client.application.dataset;
 
 import java.util.LinkedHashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetPropertyEditor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetPropertyEditor.java
index 93c4039cdca..5947945712d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetPropertyEditor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetPropertyEditor.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.plugin.generic.client.web.client.application.dataset;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetRelationshipBrowser.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetRelationshipBrowser.java
index 466071a6dd2..686f88ed47d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetRelationshipBrowser.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetRelationshipBrowser.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.plugin.generic.client.web.client.application.dataset;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataViewSection.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataViewSection.java
index d6a672024c8..c35344aac9d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataViewSection.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataViewSection.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.plugin.generic.client.web.client.application.dataset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.data.DatastoreServiceDescriptionModel.createFakeReportingServiceModel;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetBatchUpdateForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetBatchUpdateForm.java
index 64fe795639c..7e4062ae0f0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetBatchUpdateForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetBatchUpdateForm.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.plugin.generic.client.web.client.application.dataset;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetEditForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetEditForm.java
index b6ecec4a0f8..201e7e5284b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetEditForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetEditForm.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.plugin.generic.client.web.client.application.dataset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.DatabaseModificationAwareField.wrapUnaware;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewer.java
index 392817b4bc7..1e5004bcf3a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewer.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.plugin.generic.client.web.client.application.dataset;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/LinkDataSetAnchor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/LinkDataSetAnchor.java
index ef6e11a4cae..22dc5b08b67 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/LinkDataSetAnchor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/LinkDataSetAnchor.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.plugin.generic.client.web.client.application.dataset;
 
 import com.google.gwt.user.client.ui.Anchor;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/AbstractExperimentBatchRegistrationForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/AbstractExperimentBatchRegistrationForm.java
index 03ab1deaa8c..f7a07d4aa0b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/AbstractExperimentBatchRegistrationForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/AbstractExperimentBatchRegistrationForm.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.plugin.generic.client.web.client.application.experiment;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/AbstractGenericExperimentRegisterEditForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/AbstractGenericExperimentRegisterEditForm.java
index 6aeec439617..d7e77962ebb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/AbstractGenericExperimentRegisterEditForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/AbstractGenericExperimentRegisterEditForm.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.plugin.generic.client.web.client.application.experiment;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.DatabaseModificationAwareField.wrapUnaware;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentDataSetBrowser.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentDataSetBrowser.java
index 5c3d05a7909..d817aa991b7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentDataSetBrowser.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentDataSetBrowser.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.plugin.generic.client.web.client.application.experiment;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentPropertiesPanel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentPropertiesPanel.java
index 901801f6963..6f336953366 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentPropertiesPanel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentPropertiesPanel.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.plugin.generic.client.web.client.application.experiment;
 
 import java.util.LinkedHashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentPropertyEditor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentPropertyEditor.java
index 082a0419578..3e7f3df2731 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentPropertyEditor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentPropertyEditor.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.plugin.generic.client.web.client.application.experiment;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentSamplesArea.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentSamplesArea.java
index b74cd5c3bee..55deaa539bd 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentSamplesArea.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentSamplesArea.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.plugin.generic.client.web.client.application.experiment;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentSamplesSection.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentSamplesSection.java
index da8d001bc47..7fe7ba5effc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentSamplesSection.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentSamplesSection.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.plugin.generic.client.web.client.application.experiment;
 
 import com.extjs.gxt.ui.client.widget.form.CheckBox;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentBatchRegistrationForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentBatchRegistrationForm.java
index 0f99f054384..5d9df766bfb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentBatchRegistrationForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentBatchRegistrationForm.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.plugin.generic.client.web.client.application.experiment;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentBatchUpdateForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentBatchUpdateForm.java
index 6104c68de72..afd44ac9994 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentBatchUpdateForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentBatchUpdateForm.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.plugin.generic.client.web.client.application.experiment;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentEditForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentEditForm.java
index 43684e84c08..9653eff4f08 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentEditForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentEditForm.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.plugin.generic.client.web.client.application.experiment;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentRegistrationForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentRegistrationForm.java
index f578b53acd4..82cf4e5b479 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentRegistrationForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentRegistrationForm.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.plugin.generic.client.web.client.application.experiment;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewer.java
index cffdae78d19..67dd8605360 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewer.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.plugin.generic.client.web.client.application.experiment;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ManagedPropertyField.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ManagedPropertyField.java
index 1c154ee7729..dd2ea1e5aec 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ManagedPropertyField.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ManagedPropertyField.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.plugin.generic.client.web.client.application.experiment;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/PropertiesEditor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/PropertiesEditor.java
index 23211a8ef3c..a445dd64619 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/PropertiesEditor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/PropertiesEditor.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.plugin.generic.client.web.client.application.experiment;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/AbstractMaterialBatchRegistrationForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/AbstractMaterialBatchRegistrationForm.java
index 38339e80a0a..1eb49851674 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/AbstractMaterialBatchRegistrationForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/AbstractMaterialBatchRegistrationForm.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.plugin.generic.client.web.client.application.material;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/GenericMaterialBatchRegistrationForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/GenericMaterialBatchRegistrationForm.java
index 9ffa8fd47f6..d27870d892a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/GenericMaterialBatchRegistrationForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/GenericMaterialBatchRegistrationForm.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.plugin.generic.client.web.client.application.material;
 
 import com.extjs.gxt.ui.client.widget.form.FormPanel;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/GenericMaterialBatchUpdateForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/GenericMaterialBatchUpdateForm.java
index 45de44f6541..d368ec61b7f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/GenericMaterialBatchUpdateForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/GenericMaterialBatchUpdateForm.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.plugin.generic.client.web.client.application.material;
 
 import com.extjs.gxt.ui.client.widget.form.FormPanel;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/GenericMaterialEditForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/GenericMaterialEditForm.java
index 35812a2e1c4..0a1681ca619 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/GenericMaterialEditForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/GenericMaterialEditForm.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.plugin.generic.client.web.client.application.material;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/GenericMaterialViewer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/GenericMaterialViewer.java
index 5b336e6bf42..3a327249aa7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/GenericMaterialViewer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/GenericMaterialViewer.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.plugin.generic.client.web.client.application.material;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/MaterialPropertyEditor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/MaterialPropertyEditor.java
index db73c45e6e0..720ef3dbab2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/MaterialPropertyEditor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/MaterialPropertyEditor.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.plugin.generic.client.web.client.application.material;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/AbstractGenericSampleRegisterEditForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/AbstractGenericSampleRegisterEditForm.java
index bd83c4f069c..39e14ef656a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/AbstractGenericSampleRegisterEditForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/AbstractGenericSampleRegisterEditForm.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.plugin.generic.client.web.client.application.sample;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.DatabaseModificationAwareField.wrapUnaware;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/AbstractSampleBatchRegistrationForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/AbstractSampleBatchRegistrationForm.java
index 420b42d06fb..4f4bda793c5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/AbstractSampleBatchRegistrationForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/AbstractSampleBatchRegistrationForm.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.plugin.generic.client.web.client.application.sample;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ContainerSamplesSection.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ContainerSamplesSection.java
index 5ac66e5bb8b..4a5f3081768 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ContainerSamplesSection.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ContainerSamplesSection.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.plugin.generic.client.web.client.application.sample;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/DerivedSamplesSection.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/DerivedSamplesSection.java
index 256591175b0..a86a3d1d1d8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/DerivedSamplesSection.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/DerivedSamplesSection.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.plugin.generic.client.web.client.application.sample;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/EntityConnectionTypeProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/EntityConnectionTypeProvider.java
index f2f674715f8..4225edf017b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/EntityConnectionTypeProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/EntityConnectionTypeProvider.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.plugin.generic.client.web.client.application.sample;
 
 import com.extjs.gxt.ui.client.event.Events;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleBatchRegistrationForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleBatchRegistrationForm.java
index cfa85760501..352cd806f66 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleBatchRegistrationForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleBatchRegistrationForm.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.plugin.generic.client.web.client.application.sample;
 
 import com.extjs.gxt.ui.client.GXT;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleBatchUpdateForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleBatchUpdateForm.java
index e36d94c7726..2d241a0e5da 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleBatchUpdateForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleBatchUpdateForm.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.plugin.generic.client.web.client.application.sample;
 
 import com.extjs.gxt.ui.client.widget.form.FormPanel;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleEditForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleEditForm.java
index de67dce3579..efdb46267e5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleEditForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleEditForm.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.plugin.generic.client.web.client.application.sample;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationForm.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationForm.java
index 68b1f96e5a7..87f5dbb93b3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationForm.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationForm.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.plugin.generic.client.web.client.application.sample;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java
index 685a9c1d900..37f05747553 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.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.plugin.generic.client.web.client.application.sample;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ParentSamplesArea.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ParentSamplesArea.java
index 19c373073f0..f7454644f45 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ParentSamplesArea.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ParentSamplesArea.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.plugin.generic.client.web.client.application.sample;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ParentSamplesSection.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ParentSamplesSection.java
index 6034cd19b79..4e732934c92 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ParentSamplesSection.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ParentSamplesSection.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.plugin.generic.client.web.client.application.sample;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ParentsPropertiesSectionBuilder.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ParentsPropertiesSectionBuilder.java
index d99f984ba00..4e0588420cb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ParentsPropertiesSectionBuilder.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ParentsPropertiesSectionBuilder.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.plugin.generic.client.web.client.application.sample;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SampleDataSetBrowser.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SampleDataSetBrowser.java
index 8d606922900..ffab3989c85 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SampleDataSetBrowser.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SampleDataSetBrowser.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.plugin.generic.client.web.client.application.sample;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SampleDataSetsSection.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SampleDataSetsSection.java
index a5acfc873e0..d5e7ed7a588 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SampleDataSetsSection.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SampleDataSetsSection.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.plugin.generic.client.web.client.application.sample;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SamplePropertyEditor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SamplePropertyEditor.java
index 110164e48c5..4f3cb9f662f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SamplePropertyEditor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SamplePropertyEditor.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.plugin.generic.client.web.client.application.sample;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SamplesArea.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SamplesArea.java
index 7033cba29f9..797ce12c289 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SamplesArea.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SamplesArea.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.plugin.generic.client.web.client.application.sample;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/AttachmentDownloadServlet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/AttachmentDownloadServlet.java
index f4a5bc6899d..ba6eceba54d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/AttachmentDownloadServlet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/AttachmentDownloadServlet.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.plugin.generic.client.web.server;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.AttachmentDownloadConstants.ATTACHMENT_DOWNLOAD_SERVLET_NAME;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/DataSetLoader.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/DataSetLoader.java
index a6d6a99c0bc..e4cab5fafb8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/DataSetLoader.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/DataSetLoader.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-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/ExperimentLoader.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/ExperimentLoader.java
index fee7ef191d7..ca992d97f9e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/ExperimentLoader.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/ExperimentLoader.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.plugin.generic.client.web.server;
 
 import java.io.Reader;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java
index 1382378af6c..c42ba60c54c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.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.plugin.generic.client.web.server;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientServiceServlet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientServiceServlet.java
index 7fa5054a272..a109e434b4f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientServiceServlet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientServiceServlet.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.plugin.generic.client.web.server;
 
 import javax.annotation.Resource;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/MaterialLoader.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/MaterialLoader.java
index d19d7200147..08b3a9f7a94 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/MaterialLoader.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/MaterialLoader.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.plugin.generic.client.web.server;
 
 import java.io.Reader;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/UpdatedExperimentLoader.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/UpdatedExperimentLoader.java
index 2dba6da3c29..1fc2d8441d0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/UpdatedExperimentLoader.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/UpdatedExperimentLoader.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.plugin.generic.client.web.server;
 
 import java.io.Reader;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/AbstractBasicExperimentParserObjectFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/AbstractBasicExperimentParserObjectFactory.java
index 479af5ebd2e..7c59b9bd6e9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/AbstractBasicExperimentParserObjectFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/AbstractBasicExperimentParserObjectFactory.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.plugin.generic.client.web.server.parser;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/MaterialUploadSectionsParser.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/MaterialUploadSectionsParser.java
index 60d11dfe92f..02e7e7772f0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/MaterialUploadSectionsParser.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/MaterialUploadSectionsParser.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.plugin.generic.client.web.server.parser;
 
 import java.io.Reader;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/NewBasicExperimentParserObjectFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/NewBasicExperimentParserObjectFactory.java
index 677bd91b63c..a7a3fae9507 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/NewBasicExperimentParserObjectFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/NewBasicExperimentParserObjectFactory.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.plugin.generic.client.web.server.parser;
 
 import ch.systemsx.cisd.common.parser.AbstractParserObjectFactory;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/NewMaterialParserObjectFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/NewMaterialParserObjectFactory.java
index 8871996fe80..02dd7463595 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/NewMaterialParserObjectFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/NewMaterialParserObjectFactory.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.plugin.generic.client.web.server.parser;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/UpdatedBasicExperimentParserObjectFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/UpdatedBasicExperimentParserObjectFactory.java
index 4d5ca178cfb..4dd46d79340 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/UpdatedBasicExperimentParserObjectFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/UpdatedBasicExperimentParserObjectFactory.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.plugin.generic.client.web.server.parser;
 
 import java.util.HashSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/UpdatedDataSetParserObjectFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/UpdatedDataSetParserObjectFactory.java
index 27a5bada53b..5c75921915d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/UpdatedDataSetParserObjectFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/UpdatedDataSetParserObjectFactory.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.plugin.generic.client.web.server.parser;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/AbstractGenericServerPlugin.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/AbstractGenericServerPlugin.java
index 9e234ad1547..e4103339e42 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/AbstractGenericServerPlugin.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/AbstractGenericServerPlugin.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.plugin.generic.server;
 
 import java.util.Set;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/DataSetIdentifiersExtractor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/DataSetIdentifiersExtractor.java
index 4dbc70db252..93bdb16391e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/DataSetIdentifiersExtractor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/DataSetIdentifiersExtractor.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.plugin.generic.server;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewDataSet;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/EntityExistenceChecker.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/EntityExistenceChecker.java
index 3727c8901bf..5d42b804179 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/EntityExistenceChecker.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/EntityExistenceChecker.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.plugin.generic.server;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/ExperimentBatchRegistration.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/ExperimentBatchRegistration.java
index 4ff84f01fb4..b238a2257e4 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/ExperimentBatchRegistration.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/ExperimentBatchRegistration.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.plugin.generic.server;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/ExperimentBatchUpdate.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/ExperimentBatchUpdate.java
index ac9453ec0ed..17a1bf02749 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/ExperimentBatchUpdate.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/ExperimentBatchUpdate.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.plugin.generic.server;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericBusinessObjectFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericBusinessObjectFactory.java
index b4b64064473..52cb7dce289 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericBusinessObjectFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericBusinessObjectFactory.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.plugin.generic.server;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericDataSetServerPlugin.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericDataSetServerPlugin.java
index e5a8147729e..efb520796c3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericDataSetServerPlugin.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericDataSetServerPlugin.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.plugin.generic.server;
 
 import javax.annotation.Resource;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericDataSetTypeSlaveServerPlugin.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericDataSetTypeSlaveServerPlugin.java
index d9981f2bec6..de0e80bd21a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericDataSetTypeSlaveServerPlugin.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericDataSetTypeSlaveServerPlugin.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.plugin.generic.server;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericSampleServerPlugin.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericSampleServerPlugin.java
index 76ba90d5356..10b64baed6f 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericSampleServerPlugin.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericSampleServerPlugin.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.plugin.generic.server;
 
 import javax.annotation.Resource;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericSampleTypeSlaveServerPlugin.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericSampleTypeSlaveServerPlugin.java
index ad0e2cc9ae9..d29ca025d1b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericSampleTypeSlaveServerPlugin.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericSampleTypeSlaveServerPlugin.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.plugin.generic.server;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServer.java
index 5925e2d294e..9fcdbf2426d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServer.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.plugin.generic.server;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerLogger.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerLogger.java
index 6367c58d9fe..0df1ff11fa6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerLogger.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerLogger.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.plugin.generic.server;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServiceServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServiceServer.java
index 03e496ba5db..0e1d2bd310c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServiceServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServiceServer.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.plugin.generic.server;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/IGenericBusinessObjectFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/IGenericBusinessObjectFactory.java
index 0c80b0e9cac..0caa6d44162 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/IGenericBusinessObjectFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/IGenericBusinessObjectFactory.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.plugin.generic.server;
 
 import ch.systemsx.cisd.openbis.generic.server.business.bo.IAbstractBussinessObjectFactory;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/IdentifersExtractor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/IdentifersExtractor.java
index f0bd6fe54e1..2b10bca975e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/IdentifersExtractor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/IdentifersExtractor.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.plugin.generic.server;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewSample;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/NormalizedSampleIdentifier.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/NormalizedSampleIdentifier.java
index 5fbf24efa44..829223cde4c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/NormalizedSampleIdentifier.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/NormalizedSampleIdentifier.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.plugin.generic.server;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/shared/IGenericServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/shared/IGenericServer.java
index 24649ce83c1..7c4f004793e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/shared/IGenericServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/shared/IGenericServer.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.plugin.generic.shared;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/shared/IGenericServerInternal.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/shared/IGenericServerInternal.java
index 28627563be0..9d9329bdf78 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/shared/IGenericServerInternal.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/shared/IGenericServerInternal.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.plugin.generic.shared;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/shared/ResourceNames.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/shared/ResourceNames.java
index 66a443fc534..b3c9215cd75 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/shared/ResourceNames.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/generic/shared/ResourceNames.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.plugin.generic.shared;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/api/v1/FacadeFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/api/v1/FacadeFactory.java
index e0144f317ab..535d38218b6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/api/v1/FacadeFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/api/v1/FacadeFactory.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.plugin.query.client.api.v1;
 
 import ch.systemsx.cisd.openbis.common.api.client.ServiceFinder;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/api/v1/IQueryApiFacade.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/api/v1/IQueryApiFacade.java
index 79c6d5eab87..a0fc217d875 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/api/v1/IQueryApiFacade.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/api/v1/IQueryApiFacade.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.plugin.query.client.api.v1;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/api/v1/QueryApiFacade.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/api/v1/QueryApiFacade.java
index 97ccf6bcdcd..25250db6ab0 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/api/v1/QueryApiFacade.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/api/v1/QueryApiFacade.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.plugin.query.client.api.v1;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/api/v1/QueryApiTest.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/api/v1/QueryApiTest.java
index 430b6e6b727..8a79b01197a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/api/v1/QueryApiTest.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/api/v1/QueryApiTest.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.plugin.query.client.api.v1;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/IQueryClientService.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/IQueryClientService.java
index 8b2f904cfe3..6d25022c311 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/IQueryClientService.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/IQueryClientService.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.plugin.query.client.web.client;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/IQueryClientServiceAsync.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/IQueryClientServiceAsync.java
index 4817369641a..7b18da138a7 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/IQueryClientServiceAsync.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/IQueryClientServiceAsync.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.plugin.query.client.web.client;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/ClientPluginFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/ClientPluginFactory.java
index 4616033b6b2..79ef2938ace 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/ClientPluginFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/ClientPluginFactory.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.plugin.query.client.web.client.application;
 
 import java.util.Collections;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/Constants.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/Constants.java
index a163c6370b9..6686bda64ec 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/Constants.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/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.openbis.plugin.query.client.web.client.application;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.GenericConstants;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/Dict.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/Dict.java
index a51620ee10b..e0228c92e6e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/Dict.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/Dict.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.plugin.query.client.web.client.application;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/DisplayTypeIDGenerator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/DisplayTypeIDGenerator.java
index 51db6b5c0e5..24319aa2ea2 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/DisplayTypeIDGenerator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/DisplayTypeIDGenerator.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.openbis.plugin.query.client.web.client.application;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.IDisplayTypeIDGenerator;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/QueryModule.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/QueryModule.java
index 3fb2ec5a067..3b8012aee31 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/QueryModule.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/QueryModule.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.openbis.plugin.query.client.web.client.application;
 
 import java.util.Arrays;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/QueryParameterValue.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/QueryParameterValue.java
index 793ff470d9d..b539dcc972c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/QueryParameterValue.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/QueryParameterValue.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.plugin.query.client.web.client.application;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/QuerySectionPanel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/QuerySectionPanel.java
index c30e48d3720..503eafd9edc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/QuerySectionPanel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/QuerySectionPanel.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.plugin.query.client.web.client.application;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/QueryViewContext.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/QueryViewContext.java
index 7938372c10d..74b28c9c509 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/QueryViewContext.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/QueryViewContext.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.openbis.plugin.query.client.web.client.application;
 
 import com.google.gwt.core.client.GWT;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/locator/QueryLocatorResolver.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/locator/QueryLocatorResolver.java
index 7936efe67b2..08ab224e37e 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/locator/QueryLocatorResolver.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/locator/QueryLocatorResolver.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.plugin.query.client.web.client.application.locator;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/AbstractQueryProviderToolbar.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/AbstractQueryProviderToolbar.java
index b4cfa7af391..2e808f72a48 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/AbstractQueryProviderToolbar.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/AbstractQueryProviderToolbar.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.plugin.query.client.web.client.application.module;
 
 import com.extjs.gxt.ui.client.event.ButtonEvent;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/IQueryProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/IQueryProvider.java
index 5eefd6b2876..ca413ef2137 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/IQueryProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/IQueryProvider.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.plugin.query.client.web.client.application.module;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.IDatabaseModificationObserver;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryBrowserGrid.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryBrowserGrid.java
index 4e6ed101a76..8a48be52d54 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryBrowserGrid.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryBrowserGrid.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.plugin.query.client.web.client.application.module;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryDatabaseModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryDatabaseModel.java
index 3df0b4adf7e..2d859aa808d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryDatabaseModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryDatabaseModel.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.plugin.query.client.web.client.application.module;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryDatabaseSelectionWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryDatabaseSelectionWidget.java
index d2e35a2cef1..e5c91c85344 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryDatabaseSelectionWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryDatabaseSelectionWidget.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.plugin.query.client.web.client.application.module;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryEditor.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryEditor.java
index 0e39a00be66..315c3262bcb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryEditor.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryEditor.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.plugin.query.client.web.client.application.module;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryModel.java
index 496a0ffd1d2..4159b15d13b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryModel.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.plugin.query.client.web.client.application.module;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryModuleDatabaseMenuItem.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryModuleDatabaseMenuItem.java
index 930eb4a2343..f8e3456690d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryModuleDatabaseMenuItem.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryModuleDatabaseMenuItem.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.openbis.plugin.query.client.web.client.application.module;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QuerySelectionWidget.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QuerySelectionWidget.java
index 9d15edce4e9..8e7699e4408 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QuerySelectionWidget.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QuerySelectionWidget.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.plugin.query.client.web.client.application.module;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryViewer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryViewer.java
index d13001d451b..2145b94c71a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryViewer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/QueryViewer.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.plugin.query.client.web.client.application.module;
 
 import java.util.Set;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/RunCannedQueryToolbar.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/RunCannedQueryToolbar.java
index 80ee9b2c80e..1649a7e160b 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/RunCannedQueryToolbar.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/RunCannedQueryToolbar.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.plugin.query.client.web.client.application.module;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/RunCustomQueryToolbar.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/RunCustomQueryToolbar.java
index 6e45f484c8e..6d702a0c0dd 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/RunCustomQueryToolbar.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/RunCustomQueryToolbar.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.plugin.query.client.web.client.application.module;
 
 import java.util.Set;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/SQLQueryField.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/SQLQueryField.java
index 231acf1ce46..541d999e81c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/SQLQueryField.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/module/SQLQueryField.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.plugin.query.client.web.client.application.module;
 
 import com.extjs.gxt.ui.client.widget.form.Field;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/dto/QueryBrowserGridColumnIDs.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/dto/QueryBrowserGridColumnIDs.java
index c430925f3c6..9a2299e9ddc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/dto/QueryBrowserGridColumnIDs.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/dto/QueryBrowserGridColumnIDs.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.plugin.query.client.web.client.dto;
 
 import ch.systemsx.cisd.openbis.plugin.query.client.web.client.application.module.QueryBrowserGrid;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/server/QueryClientService.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/server/QueryClientService.java
index 99504a39627..9d8fd1e515c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/server/QueryClientService.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/server/QueryClientService.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.plugin.query.client.web.server;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/server/QueryClientServiceServlet.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/server/QueryClientServiceServlet.java
index 5c1a5a674de..bdecb91102c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/server/QueryClientServiceServlet.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/server/QueryClientServiceServlet.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.plugin.query.client.web.server;
 
 import javax.annotation.Resource;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/server/resultset/QueryExpressionProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/server/resultset/QueryExpressionProvider.java
index 9a0a16a79a2..318c0bd36f5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/server/resultset/QueryExpressionProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/server/resultset/QueryExpressionProvider.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.plugin.query.client.web.server.resultset;
 
 import static ch.systemsx.cisd.openbis.generic.client.web.client.dto.CommonGridColumnIDs.MODIFICATION_DATE;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/DAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/DAO.java
index df1b41a0003..d838bc1f9cb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/DAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/DAO.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.plugin.query.server;
 
 import java.math.BigDecimal;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/IDAO.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/IDAO.java
index b1ac5af9728..ba7f470a1af 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/IDAO.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/IDAO.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.plugin.query.server;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModel;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryDatabaseDefinitionProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryDatabaseDefinitionProvider.java
index 8e1c183481f..a7f591ecb57 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryDatabaseDefinitionProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryDatabaseDefinitionProvider.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.plugin.query.server;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryDatabaseDefinitionProviderAutoInitialized.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryDatabaseDefinitionProviderAutoInitialized.java
index fd1491e62c4..ac3f02ffaad 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryDatabaseDefinitionProviderAutoInitialized.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryDatabaseDefinitionProviderAutoInitialized.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.systemsx.cisd.openbis.plugin.query.server;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryServer.java
index af55438d492..c6d75e71658 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryServer.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.plugin.query.server;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryServerLogger.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryServerLogger.java
index f3e8ae9b670..a9b2d515a42 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryServerLogger.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryServerLogger.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.plugin.query.server;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiLogger.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiLogger.java
index daf117d51e3..8ec493a1fe3 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiLogger.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiLogger.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.plugin.query.server.api.v1;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServer.java
index 51fba7a3d0f..0d077225acf 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServer.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.plugin.query.server.api.v1;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryServiceJsonServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryServiceJsonServer.java
index b4c79fc81fb..6735744d4d6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryServiceJsonServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryServiceJsonServer.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.openbis.plugin.query.server.api.v1;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryServiceServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryServiceServer.java
index fc2648b0c42..703fa4cba7d 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryServiceServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryServiceServer.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.openbis.plugin.query.server.api.v1;
 
 import java.io.IOException;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/ResourceNames.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/ResourceNames.java
index d41255c5add..c841471eab9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/ResourceNames.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/ResourceNames.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.plugin.query.server.api.v1;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/AuthorizationChecker.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/AuthorizationChecker.java
index d4ed8fc3117..c7b74758a09 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/AuthorizationChecker.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/AuthorizationChecker.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.plugin.query.server.authorization;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/IAuthorizationChecker.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/IAuthorizationChecker.java
index 5b501e66e23..1feb44e0874 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/IAuthorizationChecker.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/IAuthorizationChecker.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.plugin.query.server.authorization;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/QueryAccessController.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/QueryAccessController.java
index c321d92c65f..d83b3e505c8 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/QueryAccessController.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/QueryAccessController.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.plugin.query.server.authorization;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/DataSetDataLoader.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/DataSetDataLoader.java
index 42a278a0122..ad41fa4bdeb 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/DataSetDataLoader.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/DataSetDataLoader.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.plugin.query.server.authorization.resultfilter;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/EntityDataLoaderFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/EntityDataLoaderFactory.java
index b8795038d1c..19e4e36f71a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/EntityDataLoaderFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/EntityDataLoaderFactory.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.plugin.query.server.authorization.resultfilter;
 
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/ExperimentDataLoader.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/ExperimentDataLoader.java
index 26bf20d099a..268425caa08 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/ExperimentDataLoader.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/ExperimentDataLoader.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.plugin.query.server.authorization.resultfilter;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/IEntityDataLoader.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/IEntityDataLoader.java
index 73216dabadd..a9a063e8f33 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/IEntityDataLoader.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/IEntityDataLoader.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.plugin.query.server.authorization.resultfilter;
 
 import java.util.Map;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/IEntityDataLoaderFactory.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/IEntityDataLoaderFactory.java
index e19f6b8f24c..0a020cf1384 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/IEntityDataLoaderFactory.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/IEntityDataLoaderFactory.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.plugin.query.server.authorization.resultfilter;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/QueryResultFilter.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/QueryResultFilter.java
index f4cfc6461cd..c520f43fc20 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/QueryResultFilter.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/QueryResultFilter.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.plugin.query.server.authorization.resultfilter;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/SampleDataLoader.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/SampleDataLoader.java
index 0022fce431b..83184125f36 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/SampleDataLoader.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/SampleDataLoader.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.plugin.query.server.authorization.resultfilter;
 
 import java.util.HashMap;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/DatabaseDefinition.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/DatabaseDefinition.java
index cf0ce7cbf35..c799dda0783 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/DatabaseDefinition.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/DatabaseDefinition.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.plugin.query.shared;
 
 import ch.systemsx.cisd.dbmigration.SimpleDatabaseConfigurationContext;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/IQueryDatabaseDefinitionProvider.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/IQueryDatabaseDefinitionProvider.java
index 0720c922eae..c044b916847 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/IQueryDatabaseDefinitionProvider.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/IQueryDatabaseDefinitionProvider.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.plugin.query.shared;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/IQueryDatabaseDefinitionProviderAutoInitialized.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/IQueryDatabaseDefinitionProviderAutoInitialized.java
index dda27704d8f..3ae479f9ad9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/IQueryDatabaseDefinitionProviderAutoInitialized.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/IQueryDatabaseDefinitionProviderAutoInitialized.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.plugin.query.shared;
 
 import java.util.Collection;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/IQueryServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/IQueryServer.java
index 8d2642ca594..ee305b8ae13 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/IQueryServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/IQueryServer.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.plugin.query.shared;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/ResourceNames.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/ResourceNames.java
index 3177410c720..3a495a56604 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/ResourceNames.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/ResourceNames.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.plugin.query.shared;
 
 /**
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/IQueryApiServer.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/IQueryApiServer.java
index f2442a13895..e7a3d1b02b5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/IQueryApiServer.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/IQueryApiServer.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.plugin.query.shared.api.v1;
 
 import java.util.List;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/AggregationServiceDescription.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/AggregationServiceDescription.java
index 44fb19a6aa2..0543d9210ca 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/AggregationServiceDescription.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/AggregationServiceDescription.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.openbis.plugin.query.shared.api.v1.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/AggregationServiceType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/AggregationServiceType.java
index 974d6f04522..fdfb27443d6 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/AggregationServiceType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/AggregationServiceType.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.plugin.query.shared.api.v1.dto;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryDescription.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryDescription.java
index 3346a88fbfa..6703e65fa4c 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryDescription.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryDescription.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.plugin.query.shared.api.v1.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryTableColumn.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryTableColumn.java
index 79ae4d326c8..b1544827ae9 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryTableColumn.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryTableColumn.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.plugin.query.shared.api.v1.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryTableColumnDataType.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryTableColumnDataType.java
index 7aaee28da35..ade03b6b561 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryTableColumnDataType.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryTableColumnDataType.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.plugin.query.shared.api.v1.dto;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryTableModel.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryTableModel.java
index 1876c4f48a8..d583c989244 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryTableModel.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/QueryTableModel.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.plugin.query.shared.api.v1.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/ReportDescription.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/ReportDescription.java
index b5eeeb58931..ab7ed285c18 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/ReportDescription.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/ReportDescription.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.plugin.query.shared.api.v1.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/TypedStringValue.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/TypedStringValue.java
index 8463f819d87..9a76993f0cc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/TypedStringValue.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/api/v1/dto/TypedStringValue.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.plugin.query.shared.api.v1.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/basic/dto/IQueryUpdates.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/basic/dto/IQueryUpdates.java
index 65698ec790b..087d46aa5ac 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/basic/dto/IQueryUpdates.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/basic/dto/IQueryUpdates.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.plugin.query.shared.basic.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IExpressionUpdates;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/basic/dto/NewQuery.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/basic/dto/NewQuery.java
index f244e374ad3..71f3ffe0a89 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/basic/dto/NewQuery.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/basic/dto/NewQuery.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.plugin.query.shared.basic.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewExpression;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/basic/dto/QueryDatabase.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/basic/dto/QueryDatabase.java
index 821b72e2072..4673313a826 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/basic/dto/QueryDatabase.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/basic/dto/QueryDatabase.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.plugin.query.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/basic/dto/QueryExpression.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/basic/dto/QueryExpression.java
index 346b09652e7..7e00fad9bdc 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/basic/dto/QueryExpression.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/basic/dto/QueryExpression.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.plugin.query.shared.basic.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AbstractExpressionWithParameters;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/basic/dto/QueryParameterBindings.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/basic/dto/QueryParameterBindings.java
index e6b0d24a57f..b5650b6dd28 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/basic/dto/QueryParameterBindings.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/basic/dto/QueryParameterBindings.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.plugin.query.shared.basic.dto;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/translator/QueryTableModelTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/translator/QueryTableModelTranslator.java
index a81e9a9082a..35b604aefab 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/translator/QueryTableModelTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/translator/QueryTableModelTranslator.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.plugin.query.shared.translator;
 
 import java.io.Serializable;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/translator/QueryTranslator.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/translator/QueryTranslator.java
index 3dd5a07e8ab..4498317d97a 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/translator/QueryTranslator.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/translator/QueryTranslator.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.plugin.query.shared.translator;
 
 import java.util.ArrayList;
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/translator/Util.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/translator/Util.java
index d05b12df130..36f0b23ecd5 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/translator/Util.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/plugin/query/shared/translator/Util.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.plugin.query.shared.translator;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataTypeCode;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/AbstractApplicationServerApiTestCase.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/AbstractApplicationServerApiTestCase.java
index 03b248c7cd4..da72e29bb2b 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/AbstractApplicationServerApiTestCase.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/AbstractApplicationServerApiTestCase.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.ethz.sis.openbis.generic.server.asapi.v3;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ExperimentServerApiTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ExperimentServerApiTest.java
index b09170e7144..80736744a19 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ExperimentServerApiTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ExperimentServerApiTest.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.ethz.sis.openbis.generic.server.asapi.v3;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/FetchOptionsToStringTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/FetchOptionsToStringTest.java
index d50ce1f9567..d7a17777121 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/FetchOptionsToStringTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/FetchOptionsToStringTest.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.server.asapi.v3;
 
 import org.testng.AssertJUnit;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/SampleServerApiTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/SampleServerApiTest.java
index a8f0ed82fd4..497f6e626e3 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/SampleServerApiTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/SampleServerApiTest.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.
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/FetchOptionsMatcherTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/FetchOptionsMatcherTest.java
index 2d0580a6b5f..4e62c9a5918 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/FetchOptionsMatcherTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/FetchOptionsMatcherTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.asapi.v3.cache;
 
 import java.lang.reflect.Modifier;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/SearchCacheTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/SearchCacheTest.java
index 4408667d35d..73ef7c87aed 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/SearchCacheTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/cache/SearchCacheTest.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.asapi.v3.cache;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/ProgressDetailsToStringBuilderTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/ProgressDetailsToStringBuilderTest.java
index 73d00d7716f..a628054d217 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/ProgressDetailsToStringBuilderTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/ProgressDetailsToStringBuilderTest.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.ethz.sis.openbis.generic.server.asapi.v3.context;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/TestClass.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/TestClass.java
index e34e280c9df..7858143e93e 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/TestClass.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/context/TestClass.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.server.asapi.v3.context;
 
 import java.util.Collection;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/AbstractExecutorTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/AbstractExecutorTest.java
index 47207f4fcf2..f3d662bf1c5 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/AbstractExecutorTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/AbstractExecutorTest.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.ethz.sis.openbis.generic.server.asapi.v3.executor;
 
 import org.jmock.Mockery;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/CacheFactory.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/CacheFactory.java
index 73f08153de6..15774ba807f 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/CacheFactory.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/CacheFactory.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.openbis.generic.server.asapi.v3.executor.common.search.cache;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/CacheTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/CacheTest.java
index 8961ae5cad0..c28bf35d2a5 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/CacheTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/CacheTest.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.openbis.generic.server.asapi.v3.executor.common.search.cache;
 
 import java.io.File;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/FileCacheFactory.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/FileCacheFactory.java
index dde94c6e946..031bd6780a0 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/FileCacheFactory.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/FileCacheFactory.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.openbis.generic.server.asapi.v3.executor.common.search.cache;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/MemoryCacheFactory.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/MemoryCacheFactory.java
index d246da2e6cd..65c0df5ad66 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/MemoryCacheFactory.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/common/search/cache/MemoryCacheFactory.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.openbis.generic.server.asapi.v3.executor.common.search.cache;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/VerifyDataSetContentCopyExecutorTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/VerifyDataSetContentCopyExecutorTest.java
index 96aeaa84559..8c0c0b50274 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/VerifyDataSetContentCopyExecutorTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/VerifyDataSetContentCopyExecutorTest.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.asapi.v3.executor.dataset;
 
 import org.python27.google.common.collect.Sets;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/MapExperimentByIdExecutorTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/MapExperimentByIdExecutorTest.java
index 92150e2eb2e..a3146d54c18 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/MapExperimentByIdExecutorTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/MapExperimentByIdExecutorTest.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.ethz.sis.openbis.generic.server.asapi.v3.executor.experiment;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/AsynchronousOperationExecutorTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/AsynchronousOperationExecutorTest.java
index 21a286df7ed..5a2626d5d47 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/AsynchronousOperationExecutorTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/AsynchronousOperationExecutorTest.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.ethz.sis.openbis.generic.server.asapi.v3.executor.operation;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/SynchronousOperationExecutorTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/SynchronousOperationExecutorTest.java
index 48fc4ef2ca3..f269f0e8c04 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/SynchronousOperationExecutorTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/SynchronousOperationExecutorTest.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.ethz.sis.openbis.generic.server.asapi.v3.executor.operation;
 
 import java.util.List;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/TestAction.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/TestAction.java
index e19b9264500..493b3a7fc6f 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/TestAction.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/TestAction.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.ethz.sis.openbis.generic.server.asapi.v3.executor.operation;
 
 import org.jmock.lib.action.CustomAction;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/TestException.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/TestException.java
index 7acc07d0774..ca23bc19376 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/TestException.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/TestException.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.server.asapi.v3.executor.operation;
 
 public class TestException extends RuntimeException
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/notification/OperationExecutionEmailNotifierTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/notification/OperationExecutionEmailNotifierTest.java
index 7c30ce10e05..13bf52b9a0d 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/notification/OperationExecutionEmailNotifierTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/notification/OperationExecutionEmailNotifierTest.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.ethz.sis.openbis.generic.server.asapi.v3.executor.operation.notification;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/notification/OperationExecutionNotifierTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/notification/OperationExecutionNotifierTest.java
index a72089c165c..ece75a793a4 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/notification/OperationExecutionNotifierTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/notification/OperationExecutionNotifierTest.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.ethz.sis.openbis.generic.server.asapi.v3.executor.operation.notification;
 
 import java.lang.reflect.Method;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/search/SearchObjectsOperationExecutorStressTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/search/SearchObjectsOperationExecutorStressTest.java
index 286e3c14f5b..a768760365e 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/search/SearchObjectsOperationExecutorStressTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/search/SearchObjectsOperationExecutorStressTest.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.asapi.v3.executor.operation.search;
 
 import static org.testng.Assert.fail;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/search/SearchObjectsOperationExecutorTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/search/SearchObjectsOperationExecutorTest.java
index 14a713ab1ed..f21354ab242 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/search/SearchObjectsOperationExecutorTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/search/SearchObjectsOperationExecutorTest.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.asapi.v3.executor.operation.search;
 
 import java.lang.Thread.State;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/search/TestSearchOperation.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/search/TestSearchOperation.java
index e6d3de4484a..e48812d0f33 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/search/TestSearchOperation.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/search/TestSearchOperation.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.ethz.sis.openbis.generic.server.asapi.v3.executor.operation.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/search/TestSearchOperationResult.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/search/TestSearchOperationResult.java
index 269b5eca241..5dc5ba350c3 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/search/TestSearchOperationResult.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/search/TestSearchOperationResult.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.ethz.sis.openbis.generic.server.asapi.v3.executor.operation.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionStoreTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionStoreTest.java
index e6591a8990a..d27ea21d7c4 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionStoreTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/store/OperationExecutionStoreTest.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.ethz.sis.openbis.generic.server.asapi.v3.executor.operation.store;
 
 import static ch.ethz.sis.openbis.generic.server.asapi.v3.executor.operation.store.OperationExecutionFSStore.ERROR_FILE_NAME;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/MapProjectByIdExecutorTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/MapProjectByIdExecutorTest.java
index e08d7240493..d45d6cc080c 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/MapProjectByIdExecutorTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/MapProjectByIdExecutorTest.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.ethz.sis.openbis.generic.server.asapi.v3.executor.project;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/AbstractEntityPropertyExecutorTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/AbstractEntityPropertyExecutorTest.java
index 0756b13b9cd..f3b3ca94c39 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/AbstractEntityPropertyExecutorTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/AbstractEntityPropertyExecutorTest.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.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
 
 import java.util.HashMap;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/UpdateEntityPropertyExecutorTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/UpdateEntityPropertyExecutorTest.java
index 24b2a2f1b97..004ef889b81 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/UpdateEntityPropertyExecutorTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/UpdateEntityPropertyExecutorTest.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.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/VerifyEntityPropertyExecutorTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/VerifyEntityPropertyExecutorTest.java
index 5efc5b2d8d3..8b362f11205 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/VerifyEntityPropertyExecutorTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/property/VerifyEntityPropertyExecutorTest.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.ethz.sis.openbis.generic.server.asapi.v3.executor.property;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/FullSampleIdentifierTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/FullSampleIdentifierTest.java
index 697099aad07..653fae37ca8 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/FullSampleIdentifierTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/FullSampleIdentifierTest.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.ethz.sis.openbis.generic.server.asapi.v3.executor.sample;
 
 import static junit.framework.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/GetTagIdentifierExecutorTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/GetTagIdentifierExecutorTest.java
index 938da9a0d00..ba07502088f 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/GetTagIdentifierExecutorTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/GetTagIdentifierExecutorTest.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import org.jmock.Expectations;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/MapTagByIdExecutorTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/MapTagByIdExecutorTest.java
index 65805cf68f8..85bd2213e7d 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/MapTagByIdExecutorTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/MapTagByIdExecutorTest.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.ethz.sis.openbis.generic.server.asapi.v3.executor.tag;
 
 import java.util.Collection;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/roleassignment/RoleAssignmentUtilsTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/roleassignment/RoleAssignmentUtilsTest.java
index c9a22d0a288..1ee25a5bc96 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/roleassignment/RoleAssignmentUtilsTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/roleassignment/RoleAssignmentUtilsTest.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.asapi.v3.helper.roleassignment;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/SortAndPageTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/SortAndPageTest.java
index 7ca384c6831..7643254a5f0 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/SortAndPageTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/sort/SortAndPageTest.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.asapi.v3.helper.sort;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/TranslationCacheTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/TranslationCacheTest.java
index bafa0d244f9..974ad2b229a 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/TranslationCacheTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/TranslationCacheTest.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.asapi.v3.translator;
 
 import static org.testng.Assert.assertTrue;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/globalsearch/GlobalSearchObjectTranslatorTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/globalsearch/GlobalSearchObjectTranslatorTest.java
index d0ebc1d3007..047e3e9ca37 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/globalsearch/GlobalSearchObjectTranslatorTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/globalsearch/GlobalSearchObjectTranslatorTest.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.asapi.v3.translator.globalsearch;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/search/AbstractSearchCriteriaTranslatorTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/search/AbstractSearchCriteriaTranslatorTest.java
index 441ea15f2da..a1c4e93ed6d 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/search/AbstractSearchCriteriaTranslatorTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/search/AbstractSearchCriteriaTranslatorTest.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.ethz.sis.openbis.generic.server.asapi.v3.translator.search;
 
 import java.lang.reflect.Method;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/search/ExperimentSearchCriteriaTranslatorTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/search/ExperimentSearchCriteriaTranslatorTest.java
index 96d5cb7ab99..4157dd3f9a3 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/search/ExperimentSearchCriteriaTranslatorTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/search/ExperimentSearchCriteriaTranslatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.asapi.v3.translator.search;
 
 import junit.framework.Assert;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/search/SampleSearchCriteriaTranslatorTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/search/SampleSearchCriteriaTranslatorTest.java
index a59ec066d9b..b50899e1795 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/search/SampleSearchCriteriaTranslatorTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/search/SampleSearchCriteriaTranslatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.asapi.v3.translator.search;
 
 import junit.framework.Assert;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/sharedapi/v3/json/GenericObjectMapperTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/sharedapi/v3/json/GenericObjectMapperTest.java
index d87da4f0008..18b0e7c12ca 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/sharedapi/v3/json/GenericObjectMapperTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/sharedapi/v3/json/GenericObjectMapperTest.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.ethz.sis.openbis.generic.server.sharedapi.v3.json;
 
 import junit.framework.Assert;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/DataSetExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/DataSetExpectations.java
index ad399c3f869..0773236b486 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/DataSetExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/DataSetExpectations.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.xls.export;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/DataSetTypeExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/DataSetTypeExpectations.java
index 28ed714b730..4b2f430b9d3 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/DataSetTypeExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/DataSetTypeExpectations.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.xls.export;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/ExperimentExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/ExperimentExpectations.java
index 3f64df6ef0d..40fca59b392 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/ExperimentExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/ExperimentExpectations.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.xls.export;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/ExperimentTypeExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/ExperimentTypeExpectations.java
index 7a1aec27c1a..0d20350a6b0 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/ExperimentTypeExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/ExperimentTypeExpectations.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.xls.export;
 
 import static ch.ethz.sis.openbis.generic.server.xls.export.XLSExportTest.TEST_SCRIPT_CONTENT;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/ProjectExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/ProjectExpectations.java
index 7be9c0f4047..2c5084b1b43 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/ProjectExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/ProjectExpectations.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.xls.export;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/PropertyAssignmentFactory.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/PropertyAssignmentFactory.java
index f0881ac4259..b1a808ba8a7 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/PropertyAssignmentFactory.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/PropertyAssignmentFactory.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.xls.export;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.plugin.Plugin;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleExpectations.java
index 246ab540628..0edee9c4f93 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleExpectations.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.xls.export;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeExpectations.java
index 025e6a9e9fa..86e6e87210a 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeExpectations.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.xls.export;
 
 import static ch.ethz.sis.openbis.generic.server.xls.export.XLSExportTest.TEST_SCRIPT_CONTENT;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithBareSamplePropertyExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithBareSamplePropertyExpectations.java
index b666a644cf5..669af605828 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithBareSamplePropertyExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithBareSamplePropertyExpectations.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.xls.export;
 
 import static ch.ethz.sis.openbis.generic.server.xls.export.XLSExportTest.DATE_RANGE_VALIDATION_SCRIPT_CONTENT;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithChainedSamplePropertiesExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithChainedSamplePropertiesExpectations.java
index b86c178b584..ebf1153a8dd 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithChainedSamplePropertiesExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithChainedSamplePropertiesExpectations.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.xls.export;
 
 import static ch.ethz.sis.openbis.generic.server.xls.export.XLSExportTest.DATE_RANGE_VALIDATION_SCRIPT_CONTENT;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithCyclicSamplePropertiesExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithCyclicSamplePropertiesExpectations.java
index 1339739eddc..595c9afe6d2 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithCyclicSamplePropertiesExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithCyclicSamplePropertiesExpectations.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.xls.export;
 
 import static ch.ethz.sis.openbis.generic.server.xls.export.XLSExportTest.DATE_RANGE_VALIDATION_SCRIPT_CONTENT;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithSamplePropertyExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithSamplePropertyExpectations.java
index 0535945e78e..5fc040c75f4 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithSamplePropertyExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithSamplePropertyExpectations.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.xls.export;
 
 import static ch.ethz.sis.openbis.generic.server.xls.export.XLSExportTest.DATE_RANGE_VALIDATION_SCRIPT_CONTENT;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithVocabularyPropertyExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithVocabularyPropertyExpectations.java
index 6700bd1224e..96bb36962ef 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithVocabularyPropertyExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithVocabularyPropertyExpectations.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.xls.export;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SpaceExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SpaceExpectations.java
index 8ead2e671b6..2d3d8e3640f 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SpaceExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SpaceExpectations.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.xls.export;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/VocabularyExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/VocabularyExpectations.java
index e3c3c2db6b7..c3bd23e763d 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/VocabularyExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/VocabularyExpectations.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.xls.export;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/XLSExportTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/XLSExportTest.java
index f51cc50725f..7bf54fbb7ff 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/XLSExportTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/XLSExportTest.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.xls.export;
 
 import static ch.ethz.sis.openbis.generic.server.xls.export.ExportableKind.DATASET;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractDataSetTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractDataSetTest.java
index 85878b3c574..fcc1472f78b 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractDataSetTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractDataSetTest.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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import static ch.systemsx.cisd.common.test.AssertionUtil.assertCollectionContainsOnly;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractDeleteEntityTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractDeleteEntityTypeTest.java
index d519a8e3860..4c1255f836d 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractDeleteEntityTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractDeleteEntityTypeTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractDeletionTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractDeletionTest.java
index a8b59900724..ae077c42bff 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractDeletionTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractDeletionTest.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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractExperimentTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractExperimentTest.java
index 67ef5247f98..d3cbb8d139c 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractExperimentTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractExperimentTest.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.ethz.sis.openbis.systemtest.asapi.v3;
 
 public class AbstractExperimentTest extends AbstractTest
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractExternalDmsTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractExternalDmsTest.java
index 539e957ca88..a9c53a7ee68 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractExternalDmsTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractExternalDmsTest.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.systemtest.asapi.v3;
 
 import java.util.Collections;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractGetEntityTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractGetEntityTypeTest.java
index e831dbd430f..8506ed17216 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractGetEntityTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractGetEntityTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractLinkDataSetTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractLinkDataSetTest.java
index 86fb9080bcd..27e1c5d92fc 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractLinkDataSetTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractLinkDataSetTest.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.systemtest.asapi.v3;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractOperationExecutionTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractOperationExecutionTest.java
index 3a0eee24cc3..9039967eea3 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractOperationExecutionTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractOperationExecutionTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractPersonalAccessTokenTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractPersonalAccessTokenTest.java
index 75a02e0e5c2..a91e949b0b0 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractPersonalAccessTokenTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractPersonalAccessTokenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractQueryTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractQueryTest.java
index 5508381e7f9..7dda8f4171e 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractQueryTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractQueryTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractSampleTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractSampleTest.java
index 97c2968c4a8..c12ac6006f5 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractSampleTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractSampleTest.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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractSearchPropertyTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractSearchPropertyTest.java
index 0eae8178698..2b1db19a722 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractSearchPropertyTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractSearchPropertyTest.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.systemtest.asapi.v3;
 
 import static ch.ethz.sis.openbis.generic.server.asapi.v3.search.translator.SearchCriteriaTranslator.DATE_FORMAT;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractTest.java
index 746a4e7412c..651b1fefda5 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractTest.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.
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractVocabularyTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractVocabularyTest.java
index 1933016792a..963a2ed9a9b 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractVocabularyTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractVocabularyTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AssignDataSetToExperimentAndSampleTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AssignDataSetToExperimentAndSampleTest.java
index cec10f467ba..9bcee6a95cd 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AssignDataSetToExperimentAndSampleTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AssignDataSetToExperimentAndSampleTest.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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AssignSampleToExperimentTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AssignSampleToExperimentTest.java
index 3568656b70f..d63b4db7c8e 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AssignSampleToExperimentTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AssignSampleToExperimentTest.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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ConfirmDeletionTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ConfirmDeletionTest.java
index 863f7affa98..60737908ca1 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ConfirmDeletionTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ConfirmDeletionTest.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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ContentCopyHistoryTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ContentCopyHistoryTest.java
index c1a8280a4d3..99e9161d51d 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ContentCopyHistoryTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ContentCopyHistoryTest.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.systemtest.asapi.v3;
 
 import static org.hamcrest.CoreMatchers.hasItem;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateAuthorizationGroupTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateAuthorizationGroupTest.java
index 92864dd37d2..32d6663dcab 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateAuthorizationGroupTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateAuthorizationGroupTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateCodesTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateCodesTest.java
index ab3beaaef37..e8b7722e4fa 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateCodesTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateCodesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateDataSetTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateDataSetTest.java
index 20e52949598..4ee18d3434f 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateDataSetTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateDataSetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateDataSetTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateDataSetTypeTest.java
index e25f4def99e..80a49ea741d 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateDataSetTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateDataSetTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateEntityTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateEntityTypeTest.java
index d7c170d5c30..1da55b30523 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateEntityTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateEntityTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateExperimentTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateExperimentTest.java
index bafc440c66f..52e6f3f36e6 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateExperimentTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateExperimentTest.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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateExperimentTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateExperimentTypeTest.java
index 3120cd7fc8c..0bd1b6aeff7 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateExperimentTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateExperimentTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateExternalDmsTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateExternalDmsTest.java
index 3bdea66084b..265b7634b51 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateExternalDmsTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateExternalDmsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.hamcrest.CoreMatchers.is;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateLinkDataSetTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateLinkDataSetTest.java
index c6247c28aa2..3c631e8c023 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateLinkDataSetTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateLinkDataSetTest.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.systemtest.asapi.v3;
 
 import static org.hamcrest.CoreMatchers.is;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateMaterialTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateMaterialTest.java
index a07d04b09a5..58d579209d5 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateMaterialTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateMaterialTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateMaterialTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateMaterialTypeTest.java
index d95c9aea822..118a839b7dd 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateMaterialTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateMaterialTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePermIdTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePermIdTest.java
index 4f7f62d7db0..cc9f3b45d8d 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePermIdTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePermIdTest.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.systemtest.asapi.v3;
 
 import static org.hamcrest.CoreMatchers.is;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePersonTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePersonTest.java
index 043eaa46625..019811fd2e0 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePersonTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePersonTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePersonalAccessTokenTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePersonalAccessTokenTest.java
index 55e3524d887..284d824bfbf 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePersonalAccessTokenTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePersonalAccessTokenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import static org.junit.Assert.assertNotNull;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePluginTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePluginTest.java
index 1c5d4589643..26b00fb975c 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePluginTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePluginTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateProjectTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateProjectTest.java
index b9872d793cb..762ef1c28e2 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateProjectTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateProjectTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePropertyTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePropertyTypeTest.java
index f5871e9b9eb..cdaf6d7e257 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePropertyTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreatePropertyTypeTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateQueryTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateQueryTest.java
index 96754bade58..364b917ae24 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateQueryTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateQueryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.systemtest.asapi.v3;
 
 import static org.junit.Assert.assertNotNull;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateRoleAssignmentTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateRoleAssignmentTest.java
index bc4007ddee4..6ee94328cef 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateRoleAssignmentTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateRoleAssignmentTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateSampleTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateSampleTest.java
index b530c3f95c4..0f2da44c41c 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateSampleTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateSampleTest.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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateSampleTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateSampleTypeTest.java
index abc0a29f750..ad8a5428a00 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateSampleTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateSampleTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateSemanticAnnotationTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateSemanticAnnotationTest.java
index 753f79f3eb3..d309e858d60 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateSemanticAnnotationTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateSemanticAnnotationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateSpaceTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateSpaceTest.java
index 29a7e509e56..d00caf2606c 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateSpaceTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateSpaceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateTagTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateTagTest.java
index 85ae29ded48..7c015ec58a4 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateTagTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateTagTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateVocabulariesTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateVocabulariesTest.java
index 78deb361ddb..870cdb70435 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateVocabulariesTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateVocabulariesTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateVocabularyTermTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateVocabularyTermTest.java
index 091fddd1dcd..476190e864b 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateVocabularyTermTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/CreateVocabularyTermTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DataSetRelationshipHistoryTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DataSetRelationshipHistoryTest.java
index f1bab2da05f..5985b2d774b 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DataSetRelationshipHistoryTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DataSetRelationshipHistoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 ETH Zuerich, SIS
+ * 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.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DataSetSearchPropertyTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DataSetSearchPropertyTest.java
index e7850a813aa..e606725618e 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DataSetSearchPropertyTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DataSetSearchPropertyTest.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.systemtest.asapi.v3;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteAuthorizationGroupTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteAuthorizationGroupTest.java
index c0e13cf9ca2..7ac68a87c27 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteAuthorizationGroupTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteAuthorizationGroupTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteDataSetTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteDataSetTest.java
index a54e57e17b5..5361581f975 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteDataSetTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteDataSetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteDataSetTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteDataSetTypeTest.java
index 068c2c566cf..e7b66bcd609 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteDataSetTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteDataSetTypeTest.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.systemtest.asapi.v3;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteExperimentTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteExperimentTest.java
index 4d0e1050f57..31fb8cd18c1 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteExperimentTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteExperimentTest.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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteExperimentTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteExperimentTypeTest.java
index b0356fcea23..44e0dbd4784 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteExperimentTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteExperimentTypeTest.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.systemtest.asapi.v3;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteExternalDmsTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteExternalDmsTest.java
index 2e18476e81a..b82f51eac11 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteExternalDmsTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteExternalDmsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.hamcrest.CoreMatchers.is;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteMaterialTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteMaterialTypeTest.java
index 9aec80ff4fc..3bd75761a6f 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteMaterialTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteMaterialTypeTest.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.systemtest.asapi.v3;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteMaterialsTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteMaterialsTest.java
index 6b077830bf1..62ace70404b 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteMaterialsTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteMaterialsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteOperationExecutionTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteOperationExecutionTest.java
index cc238540c72..e27e836e16a 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteOperationExecutionTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteOperationExecutionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.systemtest.asapi.v3;
 
 import static ch.ethz.sis.openbis.generic.asapi.v3.dto.operation.OperationExecutionAvailability.AVAILABLE;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeletePersonTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeletePersonTest.java
index fc0bc219836..486aa9ce675 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeletePersonTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeletePersonTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeletePersonalAccessTokenTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeletePersonalAccessTokenTest.java
index fdd61ab0f6a..0c2c6924234 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeletePersonalAccessTokenTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeletePersonalAccessTokenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import static org.junit.Assert.assertNull;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeletePluginTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeletePluginTest.java
index ffeb13e58db..a5d5f5df1c4 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeletePluginTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeletePluginTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteProjectTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteProjectTest.java
index 769a4a0f67e..67777fb7db4 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteProjectTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteProjectTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeletePropertyTypesTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeletePropertyTypesTest.java
index 59dea0d8e5a..f7ace4f6297 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeletePropertyTypesTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeletePropertyTypesTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteQueryTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteQueryTest.java
index 84266d6ddad..52cd75a3a45 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteQueryTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteQueryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertNotNull;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteRoleAssignmentTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteRoleAssignmentTest.java
index c21ed8a99db..f35a8c02614 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteRoleAssignmentTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteRoleAssignmentTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteSampleTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteSampleTest.java
index 4db21d3e6d3..c2158098aa1 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteSampleTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteSampleTest.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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteSampleTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteSampleTypeTest.java
index 1130f533a5a..61e806d7653 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteSampleTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteSampleTypeTest.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.systemtest.asapi.v3;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteSemanticAnnotationTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteSemanticAnnotationTest.java
index da8265381bb..850d97e36d4 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteSemanticAnnotationTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteSemanticAnnotationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteSpaceTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteSpaceTest.java
index ce9974807b7..14f17fa7486 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteSpaceTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteSpaceTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteTagTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteTagTest.java
index 3394c29b5ee..7ca8036ab8b 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteTagTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteTagTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteVocabularyTermTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteVocabularyTermTest.java
index 64f2fded482..4da4fbb40a8 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteVocabularyTermTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteVocabularyTermTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteVocabularyTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteVocabularyTest.java
index f4d2e943b7d..7f3f7b87b84 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteVocabularyTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/DeleteVocabularyTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/EntityDeletionTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/EntityDeletionTest.java
index d52c6bd5057..1369218bb32 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/EntityDeletionTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/EntityDeletionTest.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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/EvaluatePluginTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/EvaluatePluginTest.java
index fd5767bff8b..f478be2a4b6 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/EvaluatePluginTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/EvaluatePluginTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/EvaluatePluginTestResources/TestDynamicPropertyHotDeployedPlugin.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/EvaluatePluginTestResources/TestDynamicPropertyHotDeployedPlugin.java
index b0050772f64..6fe721bc225 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/EvaluatePluginTestResources/TestDynamicPropertyHotDeployedPlugin.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/EvaluatePluginTestResources/TestDynamicPropertyHotDeployedPlugin.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.systemtest.asapi.v3.EvaluatePluginTestResources;
 
 import java.util.EnumSet;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/EvaluatePluginTestResources/TestEntityValidationHotDeployedPlugin.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/EvaluatePluginTestResources/TestEntityValidationHotDeployedPlugin.java
index e0229344098..3ab8af9b75f 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/EvaluatePluginTestResources/TestEntityValidationHotDeployedPlugin.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/EvaluatePluginTestResources/TestEntityValidationHotDeployedPlugin.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.systemtest.asapi.v3.EvaluatePluginTestResources;
 
 import java.util.EnumSet;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExecuteOperationsTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExecuteOperationsTest.java
index f619e438546..e04705c5fbe 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExecuteOperationsTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExecuteOperationsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.systemtest.asapi.v3;
 
 import static ch.ethz.sis.openbis.generic.asapi.v3.dto.operation.OperationExecutionAvailability.AVAILABLE;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExecuteQueryTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExecuteQueryTest.java
index 62147d9abf7..0bc582d21bb 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExecuteQueryTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExecuteQueryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExecuteServiceTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExecuteServiceTest.java
index c61feac6ba3..a3f1e4f808c 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExecuteServiceTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExecuteServiceTest.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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExecuteSqlTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExecuteSqlTest.java
index 758e5046d06..1d0a88b7d1d 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExecuteSqlTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExecuteSqlTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExperimentRelationshipHistoryTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExperimentRelationshipHistoryTest.java
index f60dcefaea5..8621cf0fd41 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExperimentRelationshipHistoryTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExperimentRelationshipHistoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 ETH Zuerich, SIS
+ * 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.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExperimentSearchPropertyTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExperimentSearchPropertyTest.java
index 800f458d528..70ccafdd142 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExperimentSearchPropertyTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ExperimentSearchPropertyTest.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.systemtest.asapi.v3;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetAuthorizationGroupTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetAuthorizationGroupTest.java
index 666ba54d7c8..544502b6f5a 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetAuthorizationGroupTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetAuthorizationGroupTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetDataSetTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetDataSetTest.java
index 28861d6ed3c..4d7a517e4de 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetDataSetTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetDataSetTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetDataSetTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetDataSetTypeTest.java
index 98d873b208c..921c24b02e0 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetDataSetTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetDataSetTypeTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetExperimentTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetExperimentTest.java
index 1f4e155f5a1..5bccc0ae810 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetExperimentTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetExperimentTest.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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetExperimentTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetExperimentTypeTest.java
index 59cf285f23d..f1d4ce498d5 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetExperimentTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetExperimentTypeTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetExternalDmsTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetExternalDmsTest.java
index d76c5a916c0..b71a894da9c 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetExternalDmsTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetExternalDmsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.hamcrest.CoreMatchers.is;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetLinkDataSetTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetLinkDataSetTest.java
index d359b9958c9..1d6d91b983c 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetLinkDataSetTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetLinkDataSetTest.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.systemtest.asapi.v3;
 
 import static org.hamcrest.CoreMatchers.anyOf;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetMaterialTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetMaterialTest.java
index 0cbe8750ffd..f466fbd5a9c 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetMaterialTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetMaterialTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetMaterialTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetMaterialTypeTest.java
index aa84b1ff7d1..a22a5de4147 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetMaterialTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetMaterialTypeTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetOperationExecutionTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetOperationExecutionTest.java
index 487153fd602..6eb65548897 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetOperationExecutionTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetOperationExecutionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetPersonTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetPersonTest.java
index 667b8802182..009874e2cbd 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetPersonTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetPersonTest.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.systemtest.asapi.v3;
 
 import static org.junit.Assert.assertNotNull;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetPersonalAccessTokenTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetPersonalAccessTokenTest.java
index a5cac2a56ed..a50b6f3dfe7 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetPersonalAccessTokenTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetPersonalAccessTokenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetPluginTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetPluginTest.java
index f57515e112d..03c159c3384 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetPluginTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetPluginTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetProjectTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetProjectTest.java
index adf6816b84b..e54939a77c4 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetProjectTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetProjectTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetPropertyTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetPropertyTypeTest.java
index 2fc57230870..20f82eb2b56 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetPropertyTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetPropertyTypeTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetQueryDatabaseTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetQueryDatabaseTest.java
index f5440739325..463efc8e080 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetQueryDatabaseTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetQueryDatabaseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetQueryTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetQueryTest.java
index 0a22edcbe3e..78bb78a5e7e 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetQueryTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetQueryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetRightsTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetRightsTest.java
index c4589b88aed..03ff56c2c87 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetRightsTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetRightsTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetRoleAssignmentsTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetRoleAssignmentsTest.java
index 8938213d1fe..f70872a4c08 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetRoleAssignmentsTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetRoleAssignmentsTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetSampleTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetSampleTest.java
index 99ed74a1350..8d1736cb147 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetSampleTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetSampleTest.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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetSampleTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetSampleTypeTest.java
index 354dfce5455..4c81c90b248 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetSampleTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetSampleTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetSemanticAnnotationTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetSemanticAnnotationTest.java
index fc2a0f58814..bbca5e5330b 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetSemanticAnnotationTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetSemanticAnnotationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetServerInformationTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetServerInformationTest.java
index 43884eb7837..eb50687fa6d 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetServerInformationTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetServerInformationTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetServerPublicInformationTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetServerPublicInformationTest.java
index 2f1c3aae4df..531ef5af84c 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetServerPublicInformationTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetServerPublicInformationTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetSessionInformationTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetSessionInformationTest.java
index 3af6f2ad81c..94ed193236f 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetSessionInformationTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetSessionInformationTest.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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import static org.junit.Assert.assertNull;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetSpaceTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetSpaceTest.java
index 2754696a3eb..39d3b1f23c7 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetSpaceTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetSpaceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetTagTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetTagTest.java
index 7f543ef6242..c4d4ee4b740 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetTagTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetTagTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetVocabulariesTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetVocabulariesTest.java
index bfa4e093989..956b25010e2 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetVocabulariesTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetVocabulariesTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetVocabularyTermTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetVocabularyTermTest.java
index 8e228df2e22..4b62daad021 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetVocabularyTermTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GetVocabularyTermTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GlobalSearchTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GlobalSearchTest.java
index 221e3ea85cc..d0b907bb242 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GlobalSearchTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GlobalSearchTest.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.systemtest.asapi.v3;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/LoginTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/LoginTest.java
index a4d109bbabf..8d62435de8e 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/LoginTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/LoginTest.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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/MethodWrapper.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/MethodWrapper.java
index 679f8a1dec1..cfb4be61630 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/MethodWrapper.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/MethodWrapper.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.systemtest.asapi.v3;
 
 import java.lang.reflect.Method;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/MixedExecuteOperationsTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/MixedExecuteOperationsTest.java
index 5eed8657459..0afcc66fe5a 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/MixedExecuteOperationsTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/MixedExecuteOperationsTest.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.systemtest.asapi.v3;
 
 import static junit.framework.Assert.assertNotNull;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ProjectRelationshipHistoryTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ProjectRelationshipHistoryTest.java
index b6a9764faf8..1b28e4becd7 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ProjectRelationshipHistoryTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ProjectRelationshipHistoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 ETH Zuerich, SIS
+ * 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.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ProjectSampleTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ProjectSampleTest.java
index dda546ceaf3..bf4b9fa49ef 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ProjectSampleTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ProjectSampleTest.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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import static junit.framework.Assert.fail;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/RevertDeletionTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/RevertDeletionTest.java
index c49647f84c0..19490721f1f 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/RevertDeletionTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/RevertDeletionTest.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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SampleRelationshipHistoryTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SampleRelationshipHistoryTest.java
index 866dd6729cd..e664eff7608 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SampleRelationshipHistoryTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SampleRelationshipHistoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 ETH Zuerich, SIS
+ * 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.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SampleSearchPropertyTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SampleSearchPropertyTest.java
index 559b73a91ca..55489eaa705 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SampleSearchPropertyTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SampleSearchPropertyTest.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.systemtest.asapi.v3;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchAuthorizationGroupTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchAuthorizationGroupTest.java
index 4c8309a767f..620e4810ea1 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchAuthorizationGroupTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchAuthorizationGroupTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDataSetTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDataSetTest.java
index fa8f8eb937a..2edc688df81 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDataSetTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDataSetTest.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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import static org.junit.Assert.fail;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDataSetTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDataSetTypeTest.java
index f40afa9e71e..f30d613026c 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDataSetTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDataSetTypeTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDataStoreTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDataStoreTest.java
index d4bdf4043a1..7fa622f69f6 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDataStoreTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDataStoreTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDeletionTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDeletionTest.java
index cd8d0a1f399..5dc72e0c7d9 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDeletionTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDeletionTest.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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchEventTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchEventTest.java
index 375499070a1..fe920749171 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchEventTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchEventTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchExperimentTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchExperimentTest.java
index 8a1209dc7e6..d7489f1b1ff 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchExperimentTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchExperimentTest.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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.attachment.Attachment;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchExperimentTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchExperimentTypeTest.java
index 768b9197c24..38252f80c16 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchExperimentTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchExperimentTypeTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchExternalDmsTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchExternalDmsTest.java
index 7cb035d0d63..de9d190f867 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchExternalDmsTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchExternalDmsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.hamcrest.CoreMatchers.hasItem;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchLinkDataSetTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchLinkDataSetTest.java
index 5c8484dcca9..0bd5be49759 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchLinkDataSetTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchLinkDataSetTest.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.systemtest.asapi.v3;
 
 import static org.hamcrest.CoreMatchers.is;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchMaterialTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchMaterialTest.java
index 5309c86194e..3e923a3f851 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchMaterialTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchMaterialTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static ch.ethz.sis.openbis.generic.server.asapi.v3.search.translator.SearchCriteriaTranslator.DATE_FORMAT;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchMaterialTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchMaterialTypeTest.java
index 64bea539355..66a81aaf880 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchMaterialTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchMaterialTypeTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchObjectKindModificationTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchObjectKindModificationTest.java
index 3ac5d99ed61..d5ae943365b 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchObjectKindModificationTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchObjectKindModificationTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchPersonTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchPersonTest.java
index 682883e1ee6..fb5d242fa77 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchPersonTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchPersonTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchPersonalAccessTokenTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchPersonalAccessTokenTest.java
index fe21f11c6e9..427da28a0ae 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchPersonalAccessTokenTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchPersonalAccessTokenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static ch.systemsx.cisd.common.test.AssertionUtil.assertCollectionContainsOnly;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchPluginTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchPluginTest.java
index cd64ac3e103..50d3af419dc 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchPluginTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchPluginTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchProjectTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchProjectTest.java
index 853f61d5aaa..ac35114ee0d 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchProjectTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchProjectTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchPropertyAssignmentTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchPropertyAssignmentTest.java
index 06cbd7fe3f7..0e467e81109 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchPropertyAssignmentTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchPropertyAssignmentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchPropertyTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchPropertyTypeTest.java
index 082f6191c4b..3df0e2f7e84 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchPropertyTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchPropertyTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchQueryDatabaseTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchQueryDatabaseTest.java
index 7960ec840cf..03e0b0c0c8d 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchQueryDatabaseTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchQueryDatabaseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchQueryTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchQueryTest.java
index 3a9dfcbe343..20ec25623c2 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchQueryTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchQueryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import java.util.List;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchRoleAssignmentsTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchRoleAssignmentsTest.java
index 6bd5a10358a..a9d9b6d9915 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchRoleAssignmentsTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchRoleAssignmentsTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchSampleTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchSampleTest.java
index 6a16cfeecda..8a32260b5b4 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchSampleTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchSampleTest.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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import static ch.systemsx.cisd.common.test.AssertionUtil.assertCollectionContainsAtLeast;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchSampleTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchSampleTypeTest.java
index 38163239eae..2e7481c3790 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchSampleTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchSampleTypeTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchSemanticAnnotationTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchSemanticAnnotationTest.java
index b992c532f9f..e748ade31a1 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchSemanticAnnotationTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchSemanticAnnotationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static ch.systemsx.cisd.common.test.AssertionUtil.assertCollectionContainsOnly;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchServiceTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchServiceTest.java
index eb9de94c2bf..456c4cd7431 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchServiceTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchServiceTest.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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchSessionInformationTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchSessionInformationTest.java
index 88cbfc25a1f..8403707cf96 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchSessionInformationTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchSessionInformationTest.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.systemtest.asapi.v3;
 
 import static ch.systemsx.cisd.common.test.AssertionUtil.assertCollectionContainsOnly;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchSpaceTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchSpaceTest.java
index 53bedf38d3d..efd06120002 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchSpaceTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchSpaceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchTagTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchTagTest.java
index 56dad25d80b..1a9419c31bf 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchTagTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchTagTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchVocabularyTermTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchVocabularyTermTest.java
index d8465befd9d..587679efdba 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchVocabularyTermTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchVocabularyTermTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchVocabularyTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchVocabularyTest.java
index e3314c46eea..5c97f2e0888 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchVocabularyTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchVocabularyTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateAuthorizationGroupTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateAuthorizationGroupTest.java
index 2ede4324826..0175772bc80 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateAuthorizationGroupTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateAuthorizationGroupTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateDataSetTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateDataSetTest.java
index 46270f2a1b5..19178b12a1d 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateDataSetTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateDataSetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateDataSetTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateDataSetTypeTest.java
index 2d438ed8951..32b06f8e5c6 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateDataSetTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateDataSetTypeTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateEntityTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateEntityTypeTest.java
index c68d74ee7d2..cffb54dc6d3 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateEntityTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateEntityTypeTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateExperimentTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateExperimentTest.java
index cedb7854294..92b3f1d081c 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateExperimentTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateExperimentTest.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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateExperimentTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateExperimentTypeTest.java
index 3f83553abdc..5ffcd2d770d 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateExperimentTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateExperimentTypeTest.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.systemtest.asapi.v3;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateExternalDmsTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateExternalDmsTest.java
index 6779c8fcb90..d3eeef803d8 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateExternalDmsTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateExternalDmsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.hamcrest.CoreMatchers.is;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateLinkDataSetTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateLinkDataSetTest.java
index b02aa3eb150..a30ee94e4ed 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateLinkDataSetTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateLinkDataSetTest.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.systemtest.asapi.v3;
 
 import static org.hamcrest.CoreMatchers.both;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateMaterialTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateMaterialTest.java
index a3bcb82424e..91d08281706 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateMaterialTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateMaterialTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateMaterialTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateMaterialTypeTest.java
index 8c1fb7a3445..db36e8297ed 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateMaterialTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateMaterialTypeTest.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.systemtest.asapi.v3;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateOperationExecutionTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateOperationExecutionTest.java
index 8aa934989fe..a5d65998d9c 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateOperationExecutionTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateOperationExecutionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.systemtest.asapi.v3;
 
 import static ch.ethz.sis.openbis.generic.asapi.v3.dto.operation.OperationExecutionAvailability.AVAILABLE;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdatePersonTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdatePersonTest.java
index 1640d56e5e2..1096363fa1f 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdatePersonTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdatePersonTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdatePersonalAccessTokenTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdatePersonalAccessTokenTest.java
index 3eedd187734..923cf05af13 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdatePersonalAccessTokenTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdatePersonalAccessTokenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import static org.junit.Assert.assertNotNull;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdatePluginTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdatePluginTest.java
index 84b8e8caf38..db7c86157fd 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdatePluginTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdatePluginTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateProjectTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateProjectTest.java
index 83e8628dfdf..4c42326c278 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateProjectTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateProjectTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdatePropertyTypesTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdatePropertyTypesTest.java
index 7d9248ed93a..a5904370111 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdatePropertyTypesTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdatePropertyTypesTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateQueryTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateQueryTest.java
index 98f1be0cf28..a315119bd52 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateQueryTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateQueryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateSampleTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateSampleTest.java
index 7bbd2e8ae69..a5dcb748f80 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateSampleTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateSampleTest.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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import static ch.systemsx.cisd.common.test.AssertionUtil.assertCollectionContainsOnly;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateSampleTypeTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateSampleTypeTest.java
index 1c7a6fb9475..a7e85ae0651 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateSampleTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateSampleTypeTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateSemanticAnnotationTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateSemanticAnnotationTest.java
index 2fb98a95a8d..b8f64b1120b 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateSemanticAnnotationTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateSemanticAnnotationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateSpaceTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateSpaceTest.java
index 3fc58a0cb59..246399c2fdb 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateSpaceTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateSpaceTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateTagTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateTagTest.java
index 636dec3e68b..9a985785d33 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateTagTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateTagTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateVocabulariesTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateVocabulariesTest.java
index befd2be8415..9cafaa09885 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateVocabulariesTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateVocabulariesTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateVocabularyTermTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateVocabularyTermTest.java
index 9bbd644d328..403b0637a00 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateVocabularyTermTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/UpdateVocabularyTermTest.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.systemtest.asapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/util/EmailUtil.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/util/EmailUtil.java
index 86b2bcddede..3e1fa522898 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/util/EmailUtil.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/util/EmailUtil.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.systemtest.asapi.v3.util;
 
 import java.io.File;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/util/Operator.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/util/Operator.java
index 7bd2b5ebe90..96c1cf89d55 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/util/Operator.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/util/Operator.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.systemtest.asapi.v3.util;
 
 import java.util.Map;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/Change.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/Change.java
index 861ee7bca22..9dcccd668a9 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/Change.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/Change.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.systemtest.deletion;
 
 import java.util.Date;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/DataSetDeletionTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/DataSetDeletionTest.java
index 508059b2005..4640ac9eb0f 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/DataSetDeletionTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/DataSetDeletionTest.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.systemtest.deletion;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/DeletionTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/DeletionTest.java
index 289cdda56ce..7ae0503ea34 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/DeletionTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/DeletionTest.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.systemtest.deletion;
 
 import static org.testng.Assert.fail;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/ExperimentDeletionTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/ExperimentDeletionTest.java
index 907fa7edadd..7bc05f3ae84 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/ExperimentDeletionTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/ExperimentDeletionTest.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.systemtest.deletion;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/MaterialDeletionTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/MaterialDeletionTest.java
index 621a90e5ac6..bf01159ac57 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/MaterialDeletionTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/MaterialDeletionTest.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.systemtest.deletion;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/ProjectDeletionTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/ProjectDeletionTest.java
index f6241c7b174..3d99dd8b509 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/ProjectDeletionTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/ProjectDeletionTest.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.systemtest.deletion;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/SampleDeletionTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/SampleDeletionTest.java
index 83fe7e333a8..52a7fee86b1 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/SampleDeletionTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/deletion/SampleDeletionTest.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.systemtest.deletion;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/DataSetFreezingTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/DataSetFreezingTest.java
index 8c0ab4eff7b..fd94d37b1cd 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/DataSetFreezingTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/DataSetFreezingTest.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.systemtest.freezing;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/ExperimentFreezingTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/ExperimentFreezingTest.java
index e8dc617c66c..b9907e5e745 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/ExperimentFreezingTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/ExperimentFreezingTest.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.systemtest.freezing;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/ExperimentSampleDataSetRelationshipsFreezingTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/ExperimentSampleDataSetRelationshipsFreezingTest.java
index 3db868d013e..3d31fd3517f 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/ExperimentSampleDataSetRelationshipsFreezingTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/ExperimentSampleDataSetRelationshipsFreezingTest.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.systemtest.freezing;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/FreezingTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/FreezingTest.java
index 574f85c5399..62c9d696d78 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/FreezingTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/FreezingTest.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.systemtest.freezing;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/FrozenFlags.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/FrozenFlags.java
index 89d80fbc817..7ac648daef3 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/FrozenFlags.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/FrozenFlags.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.systemtest.freezing;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/ProjectExperimentRelationshipsFreezingTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/ProjectExperimentRelationshipsFreezingTest.java
index 87baa432b76..1b4205497c6 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/ProjectExperimentRelationshipsFreezingTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/ProjectExperimentRelationshipsFreezingTest.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.systemtest.freezing;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/ProjectFreezingTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/ProjectFreezingTest.java
index 246fb2a1a92..c860a138ba5 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/ProjectFreezingTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/ProjectFreezingTest.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.systemtest.freezing;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/SampleFreezingTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/SampleFreezingTest.java
index b11bc8698e3..1baf32bc525 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/SampleFreezingTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/SampleFreezingTest.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.systemtest.freezing;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/SpaceExperimentSampleRelationshipsFreezingTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/SpaceExperimentSampleRelationshipsFreezingTest.java
index 4d8585760b7..65cb2c8ecf0 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/SpaceExperimentSampleRelationshipsFreezingTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/SpaceExperimentSampleRelationshipsFreezingTest.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.systemtest.freezing;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/SpaceFreezingTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/SpaceFreezingTest.java
index 352874b3859..7fcbc8e4cf3 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/SpaceFreezingTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/SpaceFreezingTest.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.systemtest.freezing;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/SpaceProjectRelationshipsFreezingTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/SpaceProjectRelationshipsFreezingTest.java
index 60bdc1225a2..4e8f801566a 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/SpaceProjectRelationshipsFreezingTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/freezing/SpaceProjectRelationshipsFreezingTest.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.systemtest.freezing;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/DependencyCheckingTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/DependencyCheckingTest.java
index 6e5be2ae442..9b5c05c1076 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/DependencyCheckingTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/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;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/EditingTestSuite1.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/EditingTestSuite1.java
index b26b64d820d..ac47303c7c3 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/EditingTestSuite1.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/EditingTestSuite1.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.generic;
 
 import junit.framework.Test;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/EditingTestSuite2.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/EditingTestSuite2.java
index 32d61d8a9c6..c443a4f5f32 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/EditingTestSuite2.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/EditingTestSuite2.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.generic;
 
 import junit.framework.Test;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/MiscellaneousClientsideCodeTestSuite.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/MiscellaneousClientsideCodeTestSuite.java
index 46107b181f7..c71b2e664dc 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/MiscellaneousClientsideCodeTestSuite.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/MiscellaneousClientsideCodeTestSuite.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.generic;
 
 import junit.framework.Test;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/OpenbisClientTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/OpenbisClientTest.java
index 51a03d0a284..046b07f5a0f 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/OpenbisClientTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/OpenbisClientTest.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/SamplePENoDAO.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/SamplePENoDAO.java
index ec6b3effe31..7d513fc4a21 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/SamplePENoDAO.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/SamplePENoDAO.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2023 - 2023 Zürich, Scientific 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.generic;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/ViewingTestSuite1.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/ViewingTestSuite1.java
index e2504741f69..bd69693ea15 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/ViewingTestSuite1.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/ViewingTestSuite1.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.generic;
 
 import junit.framework.Test;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/ViewingTestSuite2.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/ViewingTestSuite2.java
index 68e9e3a3852..7a45f1f1903 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/ViewingTestSuite2.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/ViewingTestSuite2.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.generic;
 
 import junit.framework.Test;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/ViewingTestSuite3.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/ViewingTestSuite3.java
index 2f3dff0b80c..b1da81efeb4 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/ViewingTestSuite3.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/ViewingTestSuite3.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.generic;
 
 import junit.framework.Test;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/console/LexerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/console/LexerTest.java
index e60ec667940..712345327a3 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/console/LexerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/console/LexerTest.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.generic.client.console;
 
 import org.testng.AssertJUnit;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/MasterDataRegistrationScriptRunnerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/MasterDataRegistrationScriptRunnerTest.java
index 59904864e56..47f90f09ff2 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/MasterDataRegistrationScriptRunnerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/MasterDataRegistrationScriptRunnerTest.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.generic.client.jython.api.v1.impl;
 
 import java.io.File;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthenticationTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthenticationTest.java
index e57baadc5d9..80159745ff8 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthenticationTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthenticationTest.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.generic.client.web.client.application;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.Login;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthorizationGroupsTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthorizationGroupsTest.java
index ba28f9a03f2..28ae5cd0aaf 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthorizationGroupsTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthorizationGroupsTest.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.generic.client.web.client.application;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthorizationManagementConsolTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthorizationManagementConsolTest.java
index 9f98f18e420..16e3e1a35f5 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthorizationManagementConsolTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthorizationManagementConsolTest.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.generic.client.web.client.application;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu.ActionMenuKind;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/DataSetSearchTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/DataSetSearchTest.java
index 4bded090efd..83e1b3b3dc8 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/DataSetSearchTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/DataSetSearchTest.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.generic.client.web.client.application;
 
 import com.google.gwt.junit.DoNotRunWith;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/DummyAuthenticationTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/DummyAuthenticationTest.java
index 0cc2f44e5bf..b3771e328cf 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/DummyAuthenticationTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/DummyAuthenticationTest.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.generic.client.web.client.application;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.Login;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/EntityTypeBrowserTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/EntityTypeBrowserTest.java
index 02d9eb252e8..1f55e6727cc 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/EntityTypeBrowserTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/EntityTypeBrowserTest.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.generic.client.web.client.application;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu.ActionMenuKind;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/EntityTypePropertyTypeAssignmentTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/EntityTypePropertyTypeAssignmentTest.java
index 15557d532bf..17166c70c4a 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/EntityTypePropertyTypeAssignmentTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/EntityTypePropertyTypeAssignmentTest.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.generic.client.web.client.application;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu.ActionMenuKind;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ExperimentBrowserTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ExperimentBrowserTest.java
index edc18c850f5..127ef20762a 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ExperimentBrowserTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ExperimentBrowserTest.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.generic.client.web.client.application;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu.ActionMenuKind;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/FileFormatTypeGridTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/FileFormatTypeGridTest.java
index 366ccd70ac0..3ac73734571 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/FileFormatTypeGridTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/FileFormatTypeGridTest.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.generic.client.web.client.application;
 
 import com.extjs.gxt.ui.client.event.ButtonEvent;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/MaterialBrowserTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/MaterialBrowserTest.java
index a248c54fab7..a9ac36325e1 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/MaterialBrowserTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/MaterialBrowserTest.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.generic.client.web.client.application;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu.ActionMenuKind;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ProjectRegistrationTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ProjectRegistrationTest.java
index d9673ab8f1a..23388bd1923 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ProjectRegistrationTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ProjectRegistrationTest.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.generic.client.web.client.application;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/PropertyTypeAssignmentBrowserTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/PropertyTypeAssignmentBrowserTest.java
index 13a3adab0a8..ba1347ea713 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/PropertyTypeAssignmentBrowserTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/PropertyTypeAssignmentBrowserTest.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.generic.client.web.client.application;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu.ActionMenuKind;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/PropertyTypeBrowserTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/PropertyTypeBrowserTest.java
index 1686f254521..f0a808af169 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/PropertyTypeBrowserTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/PropertyTypeBrowserTest.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.generic.client.web.client.application;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu.ActionMenuKind;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/PropertyTypeRegistrationTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/PropertyTypeRegistrationTest.java
index 03a25c10645..2fee4c5d4bb 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/PropertyTypeRegistrationTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/PropertyTypeRegistrationTest.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.generic.client.web.client.application;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu.ActionMenuKind;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SampleBrowserTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SampleBrowserTest.java
index 846c40f32c3..f757d40722c 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SampleBrowserTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SampleBrowserTest.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.generic.client.web.client.application;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu.ActionMenuKind;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SearchCommand.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SearchCommand.java
index 10e3996b698..e6dff1720e2 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SearchCommand.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SearchCommand.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.generic.client.web.client.application;
 
 import com.extjs.gxt.ui.client.data.ModelData;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SearchTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SearchTest.java
index 53d71a1fcfa..3fb894a64b8 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SearchTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SearchTest.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.generic.client.web.client.application;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.Login;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/TestConstants.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/TestConstants.java
index d4a45f57ddd..c0c57798545 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/TestConstants.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/TestConstants.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.generic.client.web.client.application;
 
 /**
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/VocabularyBrowserTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/VocabularyBrowserTest.java
index 5d5604bb742..297783cc258 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/VocabularyBrowserTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/VocabularyBrowserTest.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.generic.client.web.client.application;
 
 import com.extjs.gxt.ui.client.widget.grid.Grid;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/VocabularyRegistrationTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/VocabularyRegistrationTest.java
index 8ceec7f9ab5..34fe53d0b9c 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/VocabularyRegistrationTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/VocabularyRegistrationTest.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.generic.client.web.client.application;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/MaterialCodeUtilsTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/MaterialCodeUtilsTest.java
index ee4fba29a0c..858a137a291 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/MaterialCodeUtilsTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/MaterialCodeUtilsTest.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.generic.client.web.client.application.locator;
 
 import org.testng.AssertJUnit;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/OpenViewCommand.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/OpenViewCommand.java
index 1e852bf628d..02fb0b54f76 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/OpenViewCommand.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/OpenViewCommand.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.generic.client.web.client.application.locator;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.Client;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/ViewLocatorResolverRegistryTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/ViewLocatorResolverRegistryTest.java
index 727c32d2cc4..478f169db34 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/ViewLocatorResolverRegistryTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/ViewLocatorResolverRegistryTest.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.generic.client.web.client.application.locator;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.Login;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/ViewLocatorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/ViewLocatorTest.java
index 751b52f9186..2a85215ed0e 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/ViewLocatorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/locator/ViewLocatorTest.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.generic.client.web.client.application.locator;
 
 import java.util.Map;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ActivateTab.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ActivateTab.java
index 4db9726523a..fd4fc931502 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ActivateTab.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ActivateTab.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.generic.client.web.client.application.ui;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.AbstractDefaultTestCommand;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/CheckTabNotExists.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/CheckTabNotExists.java
index 52c1fabebf4..4fa2b3f212c 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/CheckTabNotExists.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/CheckTabNotExists.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.generic.client.web.client.application.ui;
 
 import junit.framework.AssertionFailedError;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/InvokeActionMenu.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/InvokeActionMenu.java
index 236dd53fc99..2e8ffc040f5 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/InvokeActionMenu.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/InvokeActionMenu.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.generic.client.web.client.application.ui;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.ActionMenu;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/Login.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/Login.java
index 0db02c0b24e..3d36a633b6b 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/Login.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/Login.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.generic.client.web.client.application.ui;
 
 import com.extjs.gxt.ui.client.widget.form.TextField;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/Logout.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/Logout.java
index 5d014657949..b80bd9d5910 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/Logout.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/Logout.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.generic.client.web.client.application.ui;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu.ActionMenuKind;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CheckAuthorizationGroupTable.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CheckAuthorizationGroupTable.java
index 7702869a51a..749ff96c02a 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CheckAuthorizationGroupTable.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CheckAuthorizationGroupTable.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.generic.client.web.client.application.ui.amc;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.AuthorizationGroupGrid;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CheckGroupTable.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CheckGroupTable.java
index e2d28f1566f..735a6c051bf 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CheckGroupTable.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CheckGroupTable.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.generic.client.web.client.application.ui.amc;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.SpaceGrid;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CheckPersonTable.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CheckPersonTable.java
index 9e7a35e86a4..32bdaf39a31 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CheckPersonTable.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CheckPersonTable.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.generic.client.web.client.application.ui.amc;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.PersonGrid;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CheckRoleAssignmentTable.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CheckRoleAssignmentTable.java
index 49cb456eb4c..a75d4ec4b8d 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CheckRoleAssignmentTable.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CheckRoleAssignmentTable.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.generic.client.web.client.application.ui.amc;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.RoleAssignmentGrid;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CreateAuthorizationGroup.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CreateAuthorizationGroup.java
index 6bddf02789b..9e45c270e60 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CreateAuthorizationGroup.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CreateAuthorizationGroup.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.generic.client.web.client.application.ui.amc;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.MainTabPanel;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CreateGroup.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CreateGroup.java
index f93c093e1f4..d08ee4b1085 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CreateGroup.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CreateGroup.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.generic.client.web.client.application.ui.amc;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.MainTabPanel;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CreatePerson.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CreatePerson.java
index 40c1af4b8a6..217e543cbb6 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CreatePerson.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/CreatePerson.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.generic.client.web.client.application.ui.amc;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.MainTabPanel;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/FillAddPersonForm.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/FillAddPersonForm.java
index 5776184a368..cbb66444344 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/FillAddPersonForm.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/FillAddPersonForm.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.generic.client.web.client.application.ui.amc;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/FillRoleAssignmentForm.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/FillRoleAssignmentForm.java
index 8cd649adbd9..a3111c228f4 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/FillRoleAssignmentForm.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/FillRoleAssignmentForm.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.generic.client.web.client.application.ui.amc;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.ModelDataPropertyNames;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/OpenAddPersonDialog.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/OpenAddPersonDialog.java
index 28e8f940290..714ff0cdf9c 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/OpenAddPersonDialog.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/OpenAddPersonDialog.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.generic.client.web.client.application.ui.amc;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.MainTabPanel;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/OpenRoleAssignmentDialog.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/OpenRoleAssignmentDialog.java
index 09963646ea4..1d89dbe1ac3 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/OpenRoleAssignmentDialog.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/OpenRoleAssignmentDialog.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.generic.client.web.client.application.ui.amc;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.MainTabPanel;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/RemovePerson.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/RemovePerson.java
index 92488bfba3c..9bc6e4a988b 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/RemovePerson.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/RemovePerson.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.generic.client.web.client.application.ui.amc;
 
 import com.extjs.gxt.ui.client.widget.grid.Grid;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/RoleAssignmentRow.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/RoleAssignmentRow.java
index 9f5435e9297..32a30c94b80 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/RoleAssignmentRow.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/RoleAssignmentRow.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.generic.client.web.client.application.ui.amc;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.RoleAssignmentGridColumnIDs;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/ShowAuthorizationGroup.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/ShowAuthorizationGroup.java
index 107a382ca6b..3ee477f8461 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/ShowAuthorizationGroup.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/ShowAuthorizationGroup.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.generic.client.web.client.application.ui.amc;
 
 import com.extjs.gxt.ui.client.widget.grid.Grid;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/Criterion.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/Criterion.java
index 4b7a45301e6..7fdfd440c17 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/Criterion.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/Criterion.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.generic.client.web.client.application.ui.data;
 
 /**
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/ShowDataSet.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/ShowDataSet.java
index 57c22145490..b9751b3ac0c 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/ShowDataSet.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/ShowDataSet.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.generic.client.web.client.application.ui.data;
 
 import com.extjs.gxt.ui.client.widget.grid.Grid;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/ShowDataSetEditor.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/ShowDataSetEditor.java
index 8270c4dff77..40bb6b9a73b 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/ShowDataSetEditor.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/ShowDataSetEditor.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.generic.client.web.client.application.ui.data;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.AbstractViewer;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/columns/DataSetRow.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/columns/DataSetRow.java
index f7c9a2111c1..704e6a3f9de 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/columns/DataSetRow.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/columns/DataSetRow.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.generic.client.web.client.application.ui.data.columns;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ExternalDataGridColumnIDs;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/columns/DataSetSearchRow.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/columns/DataSetSearchRow.java
index 47cdcedeced..8fdc21ff0e2 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/columns/DataSetSearchRow.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/columns/DataSetSearchRow.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.generic.client.web.client.application.ui.data.columns;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.util.GridTestUtils;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/CheckExperimentTable.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/CheckExperimentTable.java
index 61bc4313570..157b1b4a4c2 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/CheckExperimentTable.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/CheckExperimentTable.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.generic.client.web.client.application.ui.experiment;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.AbstractDefaultTestCommand;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ChooseTypeOfNewExperiment.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ChooseTypeOfNewExperiment.java
index ccc79fef8b3..c701640d0af 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ChooseTypeOfNewExperiment.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ChooseTypeOfNewExperiment.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.generic.client.web.client.application.ui.experiment;
 
 import com.extjs.gxt.ui.client.widget.form.ComboBox;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ListExperiments.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ListExperiments.java
index e13a66033fc..f81898084b8 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ListExperiments.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ListExperiments.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.generic.client.web.client.application.ui.experiment;
 
 import com.extjs.gxt.ui.client.data.ModelData;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ShowExperiment.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ShowExperiment.java
index 8a1d4aaa458..c17242c9538 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ShowExperiment.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ShowExperiment.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.generic.client.web.client.application.ui.experiment;
 
 import com.extjs.gxt.ui.client.widget.grid.Grid;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ShowExperimentEditor.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ShowExperimentEditor.java
index 5c6552d0902..c996a929be0 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ShowExperimentEditor.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ShowExperimentEditor.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.generic.client.web.client.application.ui.experiment;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.AbstractViewer;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/columns/ExperimentRow.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/columns/ExperimentRow.java
index 1bc7758ea34..ccb97ce3310 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/columns/ExperimentRow.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/columns/ExperimentRow.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.generic.client.web.client.application.ui.experiment.columns;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ExperimentBrowserGridColumnIDs;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/AddFilterCommand.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/AddFilterCommand.java
index 8c7dda197ab..41fd5948d38 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/AddFilterCommand.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/AddFilterCommand.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.generic.client.web.client.application.ui.grid.expressions.filter;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.expressions.common.AbstractGridCustomExpressionEditOrRegisterDialog;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/ApplyFilterCommand.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/ApplyFilterCommand.java
index c2e1a5563ed..b8e91feb5c1 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/ApplyFilterCommand.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/ApplyFilterCommand.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.generic.client.web.client.application.ui.grid.expressions.filter;
 
 import com.extjs.gxt.ui.client.widget.form.ComboBox;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/CheckFiltersTableCommand.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/CheckFiltersTableCommand.java
index 0a3c3b1080e..2308c405319 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/CheckFiltersTableCommand.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/CheckFiltersTableCommand.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.generic.client.web.client.application.ui.grid.expressions.filter;
 
 import com.extjs.gxt.ui.client.widget.Dialog;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/OpenFilterSettingsCommand.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/OpenFilterSettingsCommand.java
index d2e910bc96e..123aa37821e 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/OpenFilterSettingsCommand.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/expressions/filter/OpenFilterSettingsCommand.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.generic.client.web.client.application.ui.grid.expressions.filter;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.BrowserGridPagingToolBar;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/CheckMaterialTable.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/CheckMaterialTable.java
index 66e91cfe6bd..fab75df8cdb 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/CheckMaterialTable.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/CheckMaterialTable.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.generic.client.web.client.application.ui.material;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.AbstractDefaultTestCommand;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/ListMaterials.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/ListMaterials.java
index 5b746a6aab3..7c0333952a6 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/ListMaterials.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/ListMaterials.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.generic.client.web.client.application.ui.material;
 
 import com.extjs.gxt.ui.client.widget.form.ComboBox;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialRow.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialRow.java
index cf35972ca9d..cc0fc665704 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialRow.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialRow.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.generic.client.web.client.application.ui.material;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.MaterialGridColumnIDs;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/project/CheckProjectTable.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/project/CheckProjectTable.java
index 648026ec418..be1045f856b 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/project/CheckProjectTable.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/project/CheckProjectTable.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.generic.client.web.client.application.ui.project;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.AbstractDefaultTestCommand;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/project/FillProjectRegistrationForm.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/project/FillProjectRegistrationForm.java
index 208ea5d7840..cec0515748e 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/project/FillProjectRegistrationForm.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/project/FillProjectRegistrationForm.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.generic.client.web.client.application.ui.project;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.ModelDataPropertyNames;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/CheckPropertyTypeAssignmentTable.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/CheckPropertyTypeAssignmentTable.java
index b09b061ef76..7841a8ba13b 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/CheckPropertyTypeAssignmentTable.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/CheckPropertyTypeAssignmentTable.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.generic.client.web.client.application.ui.property_type;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.AbstractDefaultTestCommand;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/CheckPropertyTypeTable.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/CheckPropertyTypeTable.java
index 7737bb34d89..b1af1a6c184 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/CheckPropertyTypeTable.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/CheckPropertyTypeTable.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.generic.client.web.client.application.ui.property_type;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.AbstractDefaultTestCommand;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/FillPropertyTypeAssignmentForm.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/FillPropertyTypeAssignmentForm.java
index acfff6b28ea..ddb9c3b4fbf 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/FillPropertyTypeAssignmentForm.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/FillPropertyTypeAssignmentForm.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.generic.client.web.client.application.ui.property_type;
 
 import com.extjs.gxt.ui.client.widget.form.CheckBox;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/FillPropertyTypeRegistrationForm.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/FillPropertyTypeRegistrationForm.java
index 28ee68805e0..3132b7e1c20 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/FillPropertyTypeRegistrationForm.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/FillPropertyTypeRegistrationForm.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.generic.client.web.client.application.ui.property_type;
 
 import com.extjs.gxt.ui.client.widget.form.ComboBox;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/CheckSampleTable.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/CheckSampleTable.java
index f29e1357346..64d3a77d833 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/CheckSampleTable.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/CheckSampleTable.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.generic.client.web.client.application.ui.sample;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.AbstractDefaultTestCommand;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/ChooseTypeOfNewSample.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/ChooseTypeOfNewSample.java
index 071f88653c5..84c247d477e 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/ChooseTypeOfNewSample.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/ChooseTypeOfNewSample.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.generic.client.web.client.application.ui.sample;
 
 import com.extjs.gxt.ui.client.widget.form.ComboBox;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/ExportSamplesTestCommand.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/ExportSamplesTestCommand.java
index 64d0f4dcecd..51bbe52c67f 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/ExportSamplesTestCommand.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/ExportSamplesTestCommand.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.generic.client.web.client.application.ui.sample;
 
 import junit.framework.Assert;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/ListSamples.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/ListSamples.java
index 4142e0780ef..7550d521c33 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/ListSamples.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/ListSamples.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.generic.client.web.client.application.ui.sample;
 
 import com.extjs.gxt.ui.client.widget.form.ComboBox;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/ShowSample.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/ShowSample.java
index 29789db15af..f789e9d0eec 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/ShowSample.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/ShowSample.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.generic.client.web.client.application.ui.sample;
 
 import com.extjs.gxt.ui.client.widget.grid.Grid;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/columns/SampleRow.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/columns/SampleRow.java
index 0bc5a20c90c..f2418fad496 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/columns/SampleRow.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/columns/SampleRow.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.generic.client.web.client.application.ui.sample.columns;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.SampleGridColumnIDs;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/FillSearchCriteria.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/FillSearchCriteria.java
index b87a74fc7d1..b84ef703bd8 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/FillSearchCriteria.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/FillSearchCriteria.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.generic.client.web.client.application.ui.search;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/util/GridTestUtils.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/util/GridTestUtils.java
index 6f44017918b..78cd6bc21b3 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/util/GridTestUtils.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/util/GridTestUtils.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.generic.client.web.client.application.ui.util;
 
 import junit.framework.Assert;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/FillVocabularyRegistrationForm.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/FillVocabularyRegistrationForm.java
index 99b6beb930d..d767462609f 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/FillVocabularyRegistrationForm.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/vocabulary/FillVocabularyRegistrationForm.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.generic.client.web.client.application.ui.vocabulary;
 
 import ch.systemsx.cisd.common.shared.basic.string.StringUtils;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/webapp/WebAppSortingAndCodeComparatorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/webapp/WebAppSortingAndCodeComparatorTest.java
index ccd3ffb4f34..88ea9503865 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/webapp/WebAppSortingAndCodeComparatorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/webapp/WebAppSortingAndCodeComparatorTest.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.generic.client.web.client.application.ui.webapp;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/webapp/WebAppUrlTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/webapp/WebAppUrlTest.java
index 29e12192869..9890f461325 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/webapp/WebAppUrlTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/webapp/WebAppUrlTest.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.generic.client.web.client.application.ui.webapp;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/AbstractDefaultTestCommand.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/AbstractDefaultTestCommand.java
index 95aa9d90462..4cc9255de3e 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/AbstractDefaultTestCommand.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/AbstractDefaultTestCommand.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.generic.client.web.client.testframework;
 
 import junit.framework.Assert;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/AbstractGWTTestCase.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/AbstractGWTTestCase.java
index 5d443e942d7..c86683c7b3a 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/AbstractGWTTestCase.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/AbstractGWTTestCase.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.generic.client.web.client.testframework;
 
 import java.util.Date;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/AbstractProperty.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/AbstractProperty.java
index a969e843599..369d2036f19 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/AbstractProperty.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/AbstractProperty.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.generic.client.web.client.testframework;
 
 import junit.framework.Assert;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/ChangeTableColumnSettingsCommand.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/ChangeTableColumnSettingsCommand.java
index 30a4a54f221..918841c0789 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/ChangeTableColumnSettingsCommand.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/ChangeTableColumnSettingsCommand.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.generic.client.web.client.testframework;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/CheckTableCommand.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/CheckTableCommand.java
index 8a7bfbeac05..955f209ee57 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/CheckTableCommand.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/CheckTableCommand.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.generic.client.web.client.testframework;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/FailureExpectation.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/FailureExpectation.java
index a68fd2c11db..bdee2028974 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/FailureExpectation.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/FailureExpectation.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.generic.client.web.client.testframework;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/GWTTestUtil.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/GWTTestUtil.java
index 1ada8dcda61..af6edf7052e 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/GWTTestUtil.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/GWTTestUtil.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.generic.client.web.client.testframework;
 
 import static junit.framework.Assert.assertTrue;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/IMessageValidator.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/IMessageValidator.java
index 033addcd7a5..54510aeb8eb 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/IMessageValidator.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/IMessageValidator.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.generic.client.web.client.testframework;
 
 /**
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/IProperty.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/IProperty.java
index f8ccfe4b7fa..944804a4041 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/IProperty.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/IProperty.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.generic.client.web.client.testframework;
 
 /**
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/IPropertyChecker.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/IPropertyChecker.java
index b214dd5d549..2cd4a14162d 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/IPropertyChecker.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/IPropertyChecker.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.generic.client.web.client.testframework;
 
 /**
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/ITestCommand.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/ITestCommand.java
index 3d2cbabcb85..9ab80b8c3da 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/ITestCommand.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/ITestCommand.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.generic.client.web.client.testframework;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/IValueAssertion.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/IValueAssertion.java
index 65dea03fd0c..4a785d6d4f6 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/IValueAssertion.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/IValueAssertion.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.generic.client.web.client.testframework;
 
 /**
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/IWidgetHandler.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/IWidgetHandler.java
index aea2acc1d93..896ffcb5149 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/IWidgetHandler.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/IWidgetHandler.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.generic.client.web.client.testframework;
 
 import com.google.gwt.user.client.ui.Widget;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/PropertyCheckingManager.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/PropertyCheckingManager.java
index ed05009ec0c..da5462ae299 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/PropertyCheckingManager.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/PropertyCheckingManager.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.generic.client.web.client.testframework;
 
 import java.util.HashMap;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/RemoteConsole.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/RemoteConsole.java
index 41e8553385d..ff5f2ccb786 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/RemoteConsole.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/RemoteConsole.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.generic.client.web.client.testframework;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/RowWithProperties.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/RowWithProperties.java
index 6d440aa72fb..e6f445c5793 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/RowWithProperties.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/RowWithProperties.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.generic.client.web.client.testframework;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.util.GridTestUtils;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/TestUtil.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/TestUtil.java
index 1d4c471e900..99f803bdbbc 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/TestUtil.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/TestUtil.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.generic.client.web.client.testframework;
 
 /**
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/WaitForAllActiveCallbacksFinish.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/WaitForAllActiveCallbacksFinish.java
index aa284853847..db4313015d0 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/WaitForAllActiveCallbacksFinish.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/WaitForAllActiveCallbacksFinish.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.generic.client.web.client.testframework;
 
 /**
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/WidgetPicker.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/WidgetPicker.java
index 16423e61955..d33413f3496 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/WidgetPicker.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/testframework/WidgetPicker.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.generic.client.web.client.testframework;
 
 import com.google.gwt.user.client.ui.Widget;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/clientnonjs/DisplaySettingsManagerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/clientnonjs/DisplaySettingsManagerTest.java
index 91640c2ca31..3ede37cbc29 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/clientnonjs/DisplaySettingsManagerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/clientnonjs/DisplaySettingsManagerTest.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.generic.client.web.clientnonjs;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/clientnonjs/ExperimentChooserFieldTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/clientnonjs/ExperimentChooserFieldTest.java
index d13f358a9fb..4b5da1f9013 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/clientnonjs/ExperimentChooserFieldTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/clientnonjs/ExperimentChooserFieldTest.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.generic.client.web.clientnonjs;
 
 import java.util.regex.Matcher;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/clientnonjs/HelpPageIdentifierTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/clientnonjs/HelpPageIdentifierTest.java
index bc33aed36e4..24fe4667346 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/clientnonjs/HelpPageIdentifierTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/clientnonjs/HelpPageIdentifierTest.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.generic.client.web.clientnonjs;
 
 import java.util.List;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/clientnonjs/URLListEncoderTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/clientnonjs/URLListEncoderTest.java
index 5f0aed1016f..3dcd66bd1ea 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/clientnonjs/URLListEncoderTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/clientnonjs/URLListEncoderTest.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.generic.client.web.clientnonjs;
 
 import org.testng.AssertJUnit;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/clientnonjs/ViewLocatorResolverRegistryTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/clientnonjs/ViewLocatorResolverRegistryTest.java
index e6197beaec3..ad5088c022f 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/clientnonjs/ViewLocatorResolverRegistryTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/clientnonjs/ViewLocatorResolverRegistryTest.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.generic.client.web.clientnonjs;
 
 import org.jmock.Expectations;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/clientnonjs/WildcardSupportingPluginFactoryMapTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/clientnonjs/WildcardSupportingPluginFactoryMapTest.java
index 703e8e55428..20e3dfdfc0e 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/clientnonjs/WildcardSupportingPluginFactoryMapTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/clientnonjs/WildcardSupportingPluginFactoryMapTest.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.generic.client.web.clientnonjs;
 
 import org.jmock.Mockery;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientServiceTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientServiceTest.java
index f4e44ccef79..c089c6d0fcf 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientServiceTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientServiceTest.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.generic.client.web.server;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientServiceTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientServiceTest.java
index da0cbae1fe0..2fa6982d9b1 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientServiceTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientServiceTest.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.generic.client.web.server;
 
 import java.io.ByteArrayInputStream;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/HelpRedirectServletTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/HelpRedirectServletTest.java
index 7b445c4878f..309e82ea2c9 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/HelpRedirectServletTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/HelpRedirectServletTest.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.generic.client.web.server;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/MessageTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/MessageTest.java
index eec3f965776..46517a7cfff 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/MessageTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/MessageTest.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.generic.client.web.server;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/UploadServiceServletTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/UploadServiceServletTest.java
index 1e0f30c0d7c..a564e7b4ba6 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/UploadServiceServletTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/UploadServiceServletTest.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.generic.client.web.server;
 
 import javax.servlet.ServletException;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/WebClientConfigurationProviderTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/WebClientConfigurationProviderTest.java
index 4657a6add1f..a6847e2b590 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/WebClientConfigurationProviderTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/WebClientConfigurationProviderTest.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.generic.client.web.server;
 
 import java.util.Properties;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/RowCalculatorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/RowCalculatorTest.java
index a9d4dfec2b5..9486bf1d669 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/RowCalculatorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/RowCalculatorTest.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.generic.client.web.server.calculator;
 
 import java.math.BigInteger;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/RowTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/RowTest.java
index 4a30e1b61bf..5776e72d82f 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/RowTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/RowTest.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.generic.client.web.server.calculator;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractProviderTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractProviderTest.java
index 924bc531c0a..b1f8a480653 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractProviderTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AbstractProviderTest.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.generic.client.web.server.resultset;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AuthorizationGroupProviderTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AuthorizationGroupProviderTest.java
index 92e6ca3d5af..580273dd51f 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AuthorizationGroupProviderTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/AuthorizationGroupProviderTest.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.generic.client.web.server.resultset;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManagerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManagerTest.java
index 8fac625b7b2..27231ec8cf3 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManagerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManagerTest.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.generic.client.web.server.resultset;
 
 import java.io.ByteArrayInputStream;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ExperimentProviderTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ExperimentProviderTest.java
index 793536a9680..dc5ee78785c 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ExperimentProviderTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ExperimentProviderTest.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.generic.client.web.server.resultset;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/FileFormatTypesProviderTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/FileFormatTypesProviderTest.java
index da1a86c95c2..6f61ac5d7e8 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/FileFormatTypesProviderTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/FileFormatTypesProviderTest.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.generic.client.web.server.resultset;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/PersonsProviderTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/PersonsProviderTest.java
index 685b680a5e2..41292d1a93c 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/PersonsProviderTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/PersonsProviderTest.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.generic.client.web.server.resultset;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/RoleAssignmentProviderTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/RoleAssignmentProviderTest.java
index 425ec5640d9..cccd40cd56e 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/RoleAssignmentProviderTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/RoleAssignmentProviderTest.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.generic.client.web.server.resultset;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SampleProviderTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SampleProviderTest.java
index a9c25381d72..0e73a36a9c5 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SampleProviderTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/SampleProviderTest.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.generic.client.web.server.resultset;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ScriptProviderTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ScriptProviderTest.java
index 556a6250dbc..d04e75a0bca 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ScriptProviderTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/ScriptProviderTest.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.generic.client.web.server.resultset;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/TableForUpdateExporterTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/TableForUpdateExporterTest.java
index f7b6a3f6290..1c29167cb28 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/TableForUpdateExporterTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/TableForUpdateExporterTest.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.generic.client.web.server.resultset;
 
 import java.io.Serializable;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/VocabulariesProviderTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/VocabulariesProviderTest.java
index 548a95569ef..7a5476d2d65 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/VocabulariesProviderTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/VocabulariesProviderTest.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.generic.client.web.server.resultset;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/translator/SearchableEntityTranslatorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/translator/SearchableEntityTranslatorTest.java
index 04df23d827c..6f315328dcf 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/translator/SearchableEntityTranslatorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/translator/SearchableEntityTranslatorTest.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.generic.client.web.server.translator;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/CustomColumnUtilsTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/CustomColumnUtilsTest.java
index 91862ed4e9c..a959456a362 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/CustomColumnUtilsTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/CustomColumnUtilsTest.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.generic.client.web.server.util;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/FilterUtilsTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/FilterUtilsTest.java
index 88d24e27edf..c0cd91cc4cc 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/FilterUtilsTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/FilterUtilsTest.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.generic.client.web.server.util;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/TSVRendererTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/TSVRendererTest.java
index d4f2365a143..131e0454e30 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/TSVRendererTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/TSVRendererTest.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.generic.client.web.server.util;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/XMLPropertyTransformerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/XMLPropertyTransformerTest.java
index ed6dc6ffd63..93fd1ee0660 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/XMLPropertyTransformerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/util/XMLPropertyTransformerTest.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.generic.client.web.server.util;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/AbstractServerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/AbstractServerTest.java
index 213a6d3e891..8f87ca634a6 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/AbstractServerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/AbstractServerTest.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.generic.server;
 
 import java.lang.reflect.Method;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java
index 273f159d4d4..0acecef0e9b 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.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.generic.server;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ConcurrentOperationLimiterConfigTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ConcurrentOperationLimiterConfigTest.java
index 0c2382c73a0..a97557b6f5d 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ConcurrentOperationLimiterConfigTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ConcurrentOperationLimiterConfigTest.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.systemsx.cisd.openbis.generic.server;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ConcurrentOperationLimiterTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ConcurrentOperationLimiterTest.java
index fc55bd9e630..50c15580501 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ConcurrentOperationLimiterTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ConcurrentOperationLimiterTest.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.server;
 
 import java.util.Properties;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/DataStoreServiceRegistratorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/DataStoreServiceRegistratorTest.java
index 61d320afc6c..3377f2056b6 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/DataStoreServiceRegistratorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/DataStoreServiceRegistratorTest.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.generic.server;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/DatabaseLastModificationAdvisorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/DatabaseLastModificationAdvisorTest.java
index 90a151996ce..c126bc9e60b 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/DatabaseLastModificationAdvisorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/DatabaseLastModificationAdvisorTest.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.generic.server;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.createOrDelete;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/DisplaySettingsProviderTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/DisplaySettingsProviderTest.java
index f032592f712..eb01e53e002 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/DisplaySettingsProviderTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/DisplaySettingsProviderTest.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.generic.server;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceDatabaseTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceDatabaseTest.java
index 5ebff89ddd0..243df74d334 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceDatabaseTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceDatabaseTest.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.generic.server;
 
 import static ch.systemsx.cisd.openbis.generic.server.dataaccess.db.DAOFactory.USE_NEW_SQL_ENGINE;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceTest.java
index f2084190b2f..2dd059b9f7c 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceTest.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.generic.server;
 
 import static ch.systemsx.cisd.openbis.generic.shared.IDataStoreService.VERSION;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/JythonEvaluatorPoolTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/JythonEvaluatorPoolTest.java
index 15289c348e8..109965aff25 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/JythonEvaluatorPoolTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/JythonEvaluatorPoolTest.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.generic.server;
 
 import static org.hamcrest.CoreMatchers.is;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/LongRunningThreadLogConfigurationTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/LongRunningThreadLogConfigurationTest.java
index c8239146c37..86c6201698c 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/LongRunningThreadLogConfigurationTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/LongRunningThreadLogConfigurationTest.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.generic.server;
 
 import java.io.IOException;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ServerInterfaceRegressionTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ServerInterfaceRegressionTest.java
index 931bd87636b..cafceec92cf 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ServerInterfaceRegressionTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ServerInterfaceRegressionTest.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.generic.server;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServerTest.java
index e399410ee69..dc394acfe8a 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ServiceForDataStoreServerTest.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.generic.server;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/TestJythonEvaluatorPool.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/TestJythonEvaluatorPool.java
index fb3324b1cb1..fb74f383760 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/TestJythonEvaluatorPool.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/TestJythonEvaluatorPool.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.generic.server;
 
 import ch.systemsx.cisd.common.jython.evaluator.Evaluator;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceTest.java
index 7003e8b41ac..383514d9afb 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceTest.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.generic.server.api.v1;
 
 import java.util.Collections;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceDatabaseTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceDatabaseTest.java
index 7c1140eeb66..b92745204bd 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceDatabaseTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceDatabaseTest.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.generic.server.api.v1;
 
 import static ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.DataSetFetchOption.CHILDREN;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceTest.java
index 46b054aee58..1bfabc78afe 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceTest.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.generic.server.api.v1;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/SampleToDataSetRelatedEntitiesTranslatorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/SampleToDataSetRelatedEntitiesTranslatorTest.java
index f580780ab95..3b50ef7b7e5 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/SampleToDataSetRelatedEntitiesTranslatorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/SampleToDataSetRelatedEntitiesTranslatorTest.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.generic.server.api.v1;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/SearchCriteriaToDetailedSearchCriteriaTranslatorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/SearchCriteriaToDetailedSearchCriteriaTranslatorTest.java
index 69c505b09ab..b3a8651badc 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/SearchCriteriaToDetailedSearchCriteriaTranslatorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/SearchCriteriaToDetailedSearchCriteriaTranslatorTest.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.generic.server.api.v1;
 
 import org.testng.AssertJUnit;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/sort/SampleSearchResultSorterTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/sort/SampleSearchResultSorterTest.java
index e15d01a9edb..297a39e7b7e 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/sort/SampleSearchResultSorterTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/sort/SampleSearchResultSorterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 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.
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationTestCase.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationTestCase.java
index 22ace8ced6e..8a5ae74fe97 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationTestCase.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationTestCase.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.generic.server.authorization;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationTestUtil.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationTestUtil.java
index 80df03d786a..99214d4a862 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationTestUtil.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationTestUtil.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.generic.server.authorization;
 
 import java.lang.reflect.InvocationHandler;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/CapabilityMapTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/CapabilityMapTest.java
index c1ca52c3873..092fa648e8b 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/CapabilityMapTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/CapabilityMapTest.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.generic.server.authorization;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultAccessControllerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultAccessControllerTest.java
index 552b4345731..fbdc787477e 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultAccessControllerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultAccessControllerTest.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.generic.server.authorization;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultReturnValueFilterTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultReturnValueFilterTest.java
index 25f702f1185..b613c93c60e 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultReturnValueFilterTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultReturnValueFilterTest.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.generic.server.authorization;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/PredicateExecutorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/PredicateExecutorTest.java
index f2334ae842c..75adf0bf945 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/PredicateExecutorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/PredicateExecutorTest.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.generic.server.authorization;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/RoleWithIdentifierTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/RoleWithIdentifierTest.java
index f498411a7c8..416bebaaa1c 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/RoleWithIdentifierTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/RoleWithIdentifierTest.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.generic.server.authorization;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/TestAuthorizationConfig.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/TestAuthorizationConfig.java
index d4175494bf3..57715a545f9 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/TestAuthorizationConfig.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/TestAuthorizationConfig.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.generic.server.authorization;
 
 import ch.systemsx.cisd.openbis.generic.shared.authorization.IAuthorizationConfig;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractTechIdCollectionPredicateTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractTechIdCollectionPredicateTest.java
index aaeabed74d3..58581810fc4 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractTechIdCollectionPredicateTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractTechIdCollectionPredicateTest.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.generic.server.authorization.predicate;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractTechIdPredicateTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractTechIdPredicateTest.java
index d9a2126cbbe..2e2d28f8f69 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractTechIdPredicateTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/AbstractTechIdPredicateTest.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.generic.server.authorization.predicate;
 
 import java.util.Collections;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ArrayPredicateTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ArrayPredicateTest.java
index 62e64173d2b..3ea2acb3e02 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ArrayPredicateTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ArrayPredicateTest.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.generic.server.authorization.predicate;
 
 import java.util.List;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/BasicEntityDescriptionPredicateTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/BasicEntityDescriptionPredicateTest.java
index f8b52287afc..0156837ea9e 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/BasicEntityDescriptionPredicateTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/BasicEntityDescriptionPredicateTest.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.generic.server.authorization.predicate;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/CollectionPredicateTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/CollectionPredicateTest.java
index e80f23ad8a2..91130999c08 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/CollectionPredicateTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/CollectionPredicateTest.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.generic.server.authorization.predicate;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetCodePredicateTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetCodePredicateTest.java
index 72c9ceefca5..c18c4eb64d5 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetCodePredicateTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetCodePredicateTest.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.generic.server.authorization.predicate;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetUpdatesCollectionPredicateTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetUpdatesCollectionPredicateTest.java
index a4e011c7090..152750caf02 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetUpdatesCollectionPredicateTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/DataSetUpdatesCollectionPredicateTest.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.generic.server.authorization.predicate;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ListSampleCriteriaPredicateTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ListSampleCriteriaPredicateTest.java
index e6d9a44a9c4..24605c99c61 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ListSampleCriteriaPredicateTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ListSampleCriteriaPredicateTest.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.generic.server.authorization.predicate;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewExperimentPredicateTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewExperimentPredicateTest.java
index 05b957c5e05..29f12195361 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewExperimentPredicateTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewExperimentPredicateTest.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.generic.server.authorization.predicate;
 
 import org.testng.annotations.Test;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewSamplePredicateTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewSamplePredicateTest.java
index a71cb39e6f9..1174b36f0cc 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewSamplePredicateTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/NewSamplePredicateTest.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.generic.server.authorization.predicate;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleUpdatesCollectionPredicateTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleUpdatesCollectionPredicateTest.java
index e2da73fca66..4e1822483a2 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleUpdatesCollectionPredicateTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleUpdatesCollectionPredicateTest.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.generic.server.authorization.predicate;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SpaceIdentifierPredicateTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SpaceIdentifierPredicateTest.java
index 0c656157f41..8e6670ed888 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SpaceIdentifierPredicateTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SpaceIdentifierPredicateTest.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.generic.server.authorization.predicate;
 
 import java.util.Collections;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/ProjectAuthorizationTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/ProjectAuthorizationTest.java
index 82d98f7671f..b31d66eac4a 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/ProjectAuthorizationTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/ProjectAuthorizationTest.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.generic.server.authorization.project;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/TestAuthSessionProvider.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/TestAuthSessionProvider.java
index 479a870c68b..c78a3fb7cf7 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/TestAuthSessionProvider.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/TestAuthSessionProvider.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.generic.server.authorization.project;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.IAuthSession;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/TestPredicate.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/TestPredicate.java
index 8ed912d303f..dca3dbd43ea 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/TestPredicate.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/TestPredicate.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.generic.server.authorization.project;
 
 import java.util.List;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/TestProject.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/TestProject.java
index 3020968a35a..713483aee72 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/TestProject.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/TestProject.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.generic.server.authorization.project;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.project.data.project.IProject;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/TestRole.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/TestRole.java
index 758924a7ea2..8821cc22027 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/TestRole.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/project/TestRole.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.generic.server.authorization.project;
 
 import ch.systemsx.cisd.openbis.generic.server.authorization.project.data.project.IProject;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/CustomGridExpressionValidatorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/CustomGridExpressionValidatorTest.java
index 08b60810d67..df123619928 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/CustomGridExpressionValidatorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/CustomGridExpressionValidatorTest.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.generic.server.authorization.validator;
 
 import org.testng.annotations.Test;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ExperimentValidatorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ExperimentValidatorTest.java
index b57fb8b26a8..8a01bb0b92e 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ExperimentValidatorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ExperimentValidatorTest.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.generic.server.authorization.validator;
 
 import org.testng.annotations.Test;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ExternalDataValidatorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ExternalDataValidatorTest.java
index 91ac4aef15e..46b5e102327 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ExternalDataValidatorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/ExternalDataValidatorTest.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.generic.server.authorization.validator;
 
 import org.testng.annotations.Test;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/GroupValidatorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/GroupValidatorTest.java
index d04561f8db5..8c915acfc69 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/GroupValidatorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/GroupValidatorTest.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.generic.server.authorization.validator;
 
 import org.testng.annotations.Test;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/MatchingEntityValidatorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/MatchingEntityValidatorTest.java
index d3cdefc8fb8..4a00f50b4c9 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/MatchingEntityValidatorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/MatchingEntityValidatorTest.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.generic.server.authorization.validator;
 
 import org.testng.annotations.Test;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SampleValidatorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SampleValidatorTest.java
index d2585a4f778..be1f9738f57 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SampleValidatorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/SampleValidatorTest.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.generic.server.authorization.validator;
 
 import org.testng.annotations.Test;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/ManagerTestTool.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/ManagerTestTool.java
index 92416b3641f..f73ef2567e4 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/ManagerTestTool.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/ManagerTestTool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.server.business;
 
 import java.sql.SQLException;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/PropertiesBatchEvaluationErrorsTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/PropertiesBatchEvaluationErrorsTest.java
index 7719e96baa7..d87535459a0 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/PropertiesBatchEvaluationErrorsTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/PropertiesBatchEvaluationErrorsTest.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.generic.server.business;
 
 import static ch.systemsx.cisd.openbis.generic.server.business.PropertiesBatchEvaluationErrors.MAX_ERROR_DETAILS_KEPT;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/PropertiesBatchManagerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/PropertiesBatchManagerTest.java
index c83429cfd7b..4d5209c28ba 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/PropertiesBatchManagerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/PropertiesBatchManagerTest.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.generic.server.business;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBOTest.java
index 5c2049178ba..dfbb1ec2d1a 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBOTest.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.generic.server.business.bo;
 
 import java.lang.reflect.Method;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AuthorizationGroupBOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AuthorizationGroupBOTest.java
index bb5d2e231dc..dd73cc61b47 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AuthorizationGroupBOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AuthorizationGroupBOTest.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.generic.server.business.bo;
 
 import org.jmock.Expectations;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/CollectionMatcher.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/CollectionMatcher.java
index ef00a4852f0..7f40cbb5cca 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/CollectionMatcher.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/CollectionMatcher.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.
  */
-
 /*
  * Copyright 2008 ETH Zuerich, CISD
  *
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/CorePluginTableTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/CorePluginTableTest.java
index b048dc58e94..051e7303e98 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/CorePluginTableTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/CorePluginTableTest.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.generic.server.business.bo;
 
 import static ch.systemsx.cisd.openbis.generic.server.business.ManagerTestTool.EXAMPLE_SESSION;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBOTest.java
index ab2b79c7c0f..fa95d18c5a6 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBOTest.java
@@ -1,6 +1,18 @@
-/**Copyright 2009 ETH Zuerich,CISD**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.*/
-
+/*
+ * 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.
+ * 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.generic.server.business.bo;
 
 import static ch.systemsx.cisd.openbis.generic.server.business.ManagerTestTool.EXAMPLE_PERSON;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataSetTableTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataSetTableTest.java
index e1a731bac22..36d13df5a4c 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataSetTableTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataSetTableTest.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.generic.server.business.bo;
 
 import static ch.systemsx.cisd.openbis.generic.server.business.ManagerTestTool.EXAMPLE_SESSION;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypeBOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypeBOTest.java
index 43e76f14431..c519bbd2486 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypeBOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypeBOTest.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.generic.server.business.bo;
 
 import static ch.systemsx.cisd.openbis.generic.server.business.ManagerTestTool.EXAMPLE_SESSION;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypePropertyTypeBOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypePropertyTypeBOTest.java
index c290bf614b1..7755bc705ae 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypePropertyTypeBOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/EntityTypePropertyTypeBOTest.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.generic.server.business.bo;
 
 import static ch.systemsx.cisd.openbis.generic.server.business.ManagerTestTool.EXAMPLE_SESSION;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentBOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentBOTest.java
index 29638299d15..cb0923ff748 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentBOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentBOTest.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.generic.server.business.bo;
 
 import static ch.systemsx.cisd.openbis.generic.server.business.ManagerTestTool.EXAMPLE_PERSON;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentTableTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentTableTest.java
index c6afe3dd380..532a7fee6c4 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentTableTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentTableTest.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.generic.server.business.bo;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/GridCustomFilterBOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/GridCustomFilterBOTest.java
index 222e3a574db..b7fcdcf2ad2 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/GridCustomFilterBOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/GridCustomFilterBOTest.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.generic.server.business.bo;
 
 import static ch.systemsx.cisd.openbis.generic.server.business.ManagerTestTool.EXAMPLE_SESSION;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/MaterialTableTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/MaterialTableTest.java
index 2863a7d5ffa..122065a1f55 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/MaterialTableTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/MaterialTableTest.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.generic.server.business.bo;
 
 import static ch.systemsx.cisd.openbis.generic.server.business.ManagerTestTool.EXAMPLE_SESSION;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ProjectBOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ProjectBOTest.java
index db86775212c..ac77f0f6e67 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ProjectBOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ProjectBOTest.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.generic.server.business.bo;
 
 import static ch.systemsx.cisd.openbis.generic.server.business.ManagerTestTool.EXAMPLE_PERSON;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyTypeBOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyTypeBOTest.java
index a2e2662c0ed..d61b253042c 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyTypeBOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyTypeBOTest.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.generic.server.business.bo;
 
 import org.jmock.Expectations;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyValidatorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyValidatorTest.java
index cc7e33e5b00..83561ef10a4 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyValidatorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyValidatorTest.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.generic.server.business.bo;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/RoleAssignmentTableTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/RoleAssignmentTableTest.java
index 7d64c728f84..86af3c35629 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/RoleAssignmentTableTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/RoleAssignmentTableTest.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.generic.server.business.bo;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleBOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleBOTest.java
index 1ba56ddbeb0..4da5ff56af1 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleBOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleBOTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.server.business.bo;
 
 import static ch.systemsx.cisd.openbis.generic.server.business.ManagerTestTool.EXAMPLE_GROUP;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleGenericBusinessRulesTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleGenericBusinessRulesTest.java
index d7b04c81922..9d1696cab69 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleGenericBusinessRulesTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleGenericBusinessRulesTest.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.generic.server.business.bo;
 
 import ch.systemsx.cisd.openbis.generic.SamplePENoDAO;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleTableTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleTableTest.java
index 7e0d0c2d1be..b91cea82290 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleTableTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleTableTest.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.openbis.generic.server.business.bo;
 
 import static ch.systemsx.cisd.openbis.generic.server.business.ManagerTestTool.EXAMPLE_SESSION;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ScriptBOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ScriptBOTest.java
index 1306cbbbc48..d94a37a592a 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ScriptBOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ScriptBOTest.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.generic.server.business.bo;
 
 import java.util.Date;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SearchDomainSearcherTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SearchDomainSearcherTest.java
index 1c19b400f5e..5297484433f 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SearchDomainSearcherTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SearchDomainSearcherTest.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.generic.server.business.bo;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SpaceBOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SpaceBOTest.java
index e4214949d72..803bedb801d 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SpaceBOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SpaceBOTest.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.generic.server.business.bo;
 
 import org.jmock.Expectations;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/TrashBOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/TrashBOTest.java
index 36fa25b3273..65b5b74c963 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/TrashBOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/TrashBOTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.generic.server.business.bo;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/VocabularyBOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/VocabularyBOTest.java
index 053d0ca0281..9b8786c1154 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/VocabularyBOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/VocabularyBOTest.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.generic.server.business.bo;
 
 import static ch.systemsx.cisd.openbis.generic.server.business.ManagerTestTool.EXAMPLE_SESSION;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/EntityListingTestUtils.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/EntityListingTestUtils.java
index bacdca92903..2fa2cddb182 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/EntityListingTestUtils.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/EntityListingTestUtils.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.generic.server.business.bo.common;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/EntityPropertiesEnricherTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/EntityPropertiesEnricherTest.java
index 67acd13ea7f..ad94bbbafc9 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/EntityPropertiesEnricherTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/EntityPropertiesEnricherTest.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.generic.server.business.bo.common;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/WrappingDataIterator.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/WrappingDataIterator.java
index 1062025edda..3d13b42a1c2 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/WrappingDataIterator.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/WrappingDataIterator.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.generic.server.business.bo.common;
 
 import java.util.Collection;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/SecondaryEntityListingQueryTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/SecondaryEntityListingQueryTest.java
index 79f5b55ca59..0e00d9f8569 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/SecondaryEntityListingQueryTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/entity/SecondaryEntityListingQueryTest.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.generic.server.business.bo.common.entity;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetListerFastTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetListerFastTest.java
index c85ff8c9ad3..65a6e98569b 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetListerFastTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetListerFastTest.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.generic.server.business.bo.datasetlister;
 
 import java.lang.reflect.Method;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetListerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetListerTest.java
index 80c37763c80..a059e09ab5f 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetListerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetListerTest.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.generic.server.business.bo.datasetlister;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetListingQueryTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetListingQueryTest.java
index b8f50225666..591d23e2f53 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetListingQueryTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetListingQueryTest.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.generic.server.business.bo.datasetlister;
 
 import static ch.systemsx.cisd.openbis.generic.server.business.bo.common.EntityListingTestUtils.asList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetSetListingQueryTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetSetListingQueryTest.java
index 84829b4a5b6..54387211d3e 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetSetListingQueryTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/DatasetSetListingQueryTest.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.generic.server.business.bo.datasetlister;
 
 import static ch.systemsx.cisd.openbis.generic.server.business.bo.common.EntityListingTestUtils.assertRecursiveEqual;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/entitygraph/DataSetNode.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/entitygraph/DataSetNode.java
index f21517c0e33..bf8134a8903 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/entitygraph/DataSetNode.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/entitygraph/DataSetNode.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.generic.server.business.bo.entitygraph;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/entitygraph/EntityGraphGenerator.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/entitygraph/EntityGraphGenerator.java
index c15f73725d7..ed5faed3995 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/entitygraph/EntityGraphGenerator.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/entitygraph/EntityGraphGenerator.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.generic.server.business.bo.entitygraph;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/entitygraph/EntityNode.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/entitygraph/EntityNode.java
index 490cc8338f5..bff38616b3c 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/entitygraph/EntityNode.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/entitygraph/EntityNode.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.generic.server.business.bo.entitygraph;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.IIdHolder;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/entitygraph/ExperimentNode.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/entitygraph/ExperimentNode.java
index 59daae0d664..08169e90aea 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/entitygraph/ExperimentNode.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/entitygraph/ExperimentNode.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.generic.server.business.bo.entitygraph;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/entitygraph/SampleNode.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/entitygraph/SampleNode.java
index 0ed3034275d..10d5ce969eb 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/entitygraph/SampleNode.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/entitygraph/SampleNode.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.generic.server.business.bo.entitygraph;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/entitygraph/Utils.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/entitygraph/Utils.java
index 228906a3527..a884bc1fc1c 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/entitygraph/Utils.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/entitygraph/Utils.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.generic.server.business.bo.entitygraph;
 
 import java.util.List;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetListerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetListerTest.java
index 48a0d8ed815..430343c3754 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetListerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetListerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 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.generic.server.business.bo.fetchoptions.datasetlister;
 
 import static junit.framework.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/experimentlister/ExperimentListerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/experimentlister/ExperimentListerTest.java
index 26d9e237960..e632c693aaf 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/experimentlister/ExperimentListerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/experimentlister/ExperimentListerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 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.generic.server.business.bo.fetchoptions.experimentlister;
 
 import static junit.framework.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/samplelister/SampleListerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/samplelister/SampleListerTest.java
index 1d2110d9c7f..69fa684a54e 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/samplelister/SampleListerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/samplelister/SampleListerTest.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.generic.server.business.bo.fetchoptions.samplelister;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/managed_property/EntityInformationProviderTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/managed_property/EntityInformationProviderTest.java
index 962ff97e72d..8c0f3ca62c6 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/managed_property/EntityInformationProviderTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/managed_property/EntityInformationProviderTest.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.generic.server.business.bo.managed_property;
 
 import org.jmock.Expectations;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/AbstractBatchIteratorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/AbstractBatchIteratorTest.java
index 98c1df09346..3cfe7117226 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/AbstractBatchIteratorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/AbstractBatchIteratorTest.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.generic.server.business.bo.materiallister;
 
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/MaterialListerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/MaterialListerTest.java
index 8c1676542c4..8537ea33e8e 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/MaterialListerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/MaterialListerTest.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.generic.server.business.bo.materiallister;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/MaterialListingQueryTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/MaterialListingQueryTest.java
index ce396f16afe..9144c3f2f92 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/MaterialListingQueryTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/MaterialListingQueryTest.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.generic.server.business.bo.materiallister;
 
 import static ch.systemsx.cisd.openbis.generic.server.business.bo.common.EntityListingTestUtils.createSet;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingQueryTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingQueryTest.java
index d88246c2891..cb83fe5e8b5 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingQueryTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingQueryTest.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.generic.server.business.bo.samplelister;
 
 import static ch.systemsx.cisd.openbis.generic.server.business.bo.common.EntityListingTestUtils.asList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingWorkerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingWorkerTest.java
index f284a8faa40..4a953eb7727 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingWorkerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleListingWorkerTest.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.generic.server.business.bo.samplelister;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleSetListingQueryTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleSetListingQueryTest.java
index 7a7769a2674..587e4db7c42 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleSetListingQueryTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/SampleSetListingQueryTest.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.generic.server.business.bo.samplelister;
 
 import static ch.systemsx.cisd.openbis.generic.server.business.bo.common.EntityListingTestUtils.asList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/importer/DatabaseInstanceImporterTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/importer/DatabaseInstanceImporterTest.java
index 454ccd3a3d6..d3f13d84c11 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/importer/DatabaseInstanceImporterTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/importer/DatabaseInstanceImporterTest.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.generic.server.business.importer;
 
 import java.io.File;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/search/SampleSearchManagerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/search/SampleSearchManagerTest.java
index 17fb6878858..550c258d03f 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/search/SampleSearchManagerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/search/SampleSearchManagerTest.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.generic.server.business.search;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/search/sort/SearchResultSorterByScoreTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/search/sort/SearchResultSorterByScoreTest.java
index 698760b39e3..d9952c1a8a6 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/search/sort/SearchResultSorterByScoreTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/search/sort/SearchResultSorterByScoreTest.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.server.business.search.sort;
 
 import static ch.systemsx.cisd.openbis.generic.server.business.search.sort.SearchResultSorterTestHelper.assertEntities;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/search/sort/SearchResultSorterTestHelper.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/search/sort/SearchResultSorterTestHelper.java
index 6b6f5d4bb00..4f00bd4ab60 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/search/sort/SearchResultSorterTestHelper.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/search/sort/SearchResultSorterTestHelper.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.server.business.search.sort;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/DataStoreServerBasedDataSourceProviderTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/DataStoreServerBasedDataSourceProviderTest.java
index acfbcbe40e3..df1ce9e9656 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/DataStoreServerBasedDataSourceProviderTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/DataStoreServerBasedDataSourceProviderTest.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.generic.server.dataaccess;
 
 import static ch.systemsx.cisd.openbis.generic.server.dataaccess.DataStoreServerBasedDataSourceProvider.DATA_STORE_SERVERS_KEY;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/DynamicPropertyEvaluationSchedulerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/DynamicPropertyEvaluationSchedulerTest.java
index cb8a555e643..96979065253 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/DynamicPropertyEvaluationSchedulerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/DynamicPropertyEvaluationSchedulerTest.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.systemsx.cisd.openbis.generic.server.dataaccess;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/EntityPropertiesConverterTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/EntityPropertiesConverterTest.java
index bda022ad365..9527ed1c28f 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/EntityPropertiesConverterTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/EntityPropertiesConverterTest.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.generic.server.dataaccess;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/EodSqlUtilsTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/EodSqlUtilsTest.java
index 7e17acda962..6ac5344f40e 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/EodSqlUtilsTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/EodSqlUtilsTest.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.openbis.generic.server.dataaccess;
 
 import static ch.systemsx.cisd.common.test.AssertionUtil.assertContainsNot;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractDAOTest.java
index ff187fa7407..203b8e904e7 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractDAOTest.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.generic.server.dataaccess.db;
 
 import org.springframework.test.context.ContextConfiguration;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractDAOWithoutContextTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractDAOWithoutContextTest.java
index 86d5c648209..a395665848d 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractDAOWithoutContextTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AbstractDAOWithoutContextTest.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.generic.server.dataaccess.db;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AttachmentDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AttachmentDAOTest.java
index 0895df858b2..38fc7cbb08b 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AttachmentDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AttachmentDAOTest.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.openbis.generic.server.dataaccess.db;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AuthorizationGroupDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AuthorizationGroupDAOTest.java
index d9af20c386b..4ef6c1be4c9 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AuthorizationGroupDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AuthorizationGroupDAOTest.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.generic.server.dataaccess.db;
 
 import java.util.List;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/CorePluginDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/CorePluginDAOTest.java
index a77c427b2a7..dedcb58cccf 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/CorePluginDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/CorePluginDAOTest.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.generic.server.dataaccess.db;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOFactoryTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOFactoryTest.java
index 30f3e98a1a6..43c3bcfcdb9 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOFactoryTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOFactoryTest.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.systemsx.cisd.openbis.generic.server.dataaccess.db;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataDAOTest.java
index 55e33d450f8..620ecb7ad86 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataDAOTest.java
@@ -1,6 +1,18 @@
-/**Copyright 2008 ETH Zuerich,CISD**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.*/
-
+/*
+ * Copyright ETH 2008 - 2023 Zürich, Scientific 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.generic.server.dataaccess.db;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataStoreDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataStoreDAOTest.java
index 99d67dbe816..7ee31636d62 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataStoreDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataStoreDAOTest.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.generic.server.dataaccess.db;
 
 import static org.testng.AssertJUnit.assertNotNull;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DatabaseCreationUtil.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DatabaseCreationUtil.java
index e2b4074e59f..e0e987d4100 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DatabaseCreationUtil.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DatabaseCreationUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.server.dataaccess.db;
 
 import java.io.File;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DeletionDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DeletionDAOTest.java
index 64e167767b8..82add763db4 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DeletionDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DeletionDAOTest.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.generic.server.dataaccess.db;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityOperationsLogDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityOperationsLogDAOTest.java
index 5f4a8304a1b..0f53057e672 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityOperationsLogDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityOperationsLogDAOTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.server.dataaccess.db;
 
 import static org.testng.AssertJUnit.assertNotNull;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAOTest.java
index 7f0bb03df2e..07080afc4cf 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAOTest.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.generic.server.dataaccess.db;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityResolverQueryTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityResolverQueryTest.java
index e7bc0319510..efd0e772cf4 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityResolverQueryTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityResolverQueryTest.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.generic.server.dataaccess.db;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityTypeDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityTypeDAOTest.java
index f1584669a98..a1901d5449f 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityTypeDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityTypeDAOTest.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.generic.server.dataaccess.db;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EventDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EventDAOTest.java
index 84117ae2e76..7a1ea649eb1 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EventDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EventDAOTest.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.generic.server.dataaccess.db;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExperimentDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExperimentDAOTest.java
index 75ae561b200..85e7d0c6eea 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExperimentDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExperimentDAOTest.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.generic.server.dataaccess.db;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExternalDataManagementSystemDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExternalDataManagementSystemDAOTest.java
index 43f70b1ce88..3d06f9c37a7 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExternalDataManagementSystemDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExternalDataManagementSystemDAOTest.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.generic.server.dataaccess.db;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/FileFormatTypeDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/FileFormatTypeDAOTest.java
index 3b5b4f420a0..0c79807603d 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/FileFormatTypeDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/FileFormatTypeDAOTest.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.generic.server.dataaccess.db;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/GridCustomColumnDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/GridCustomColumnDAOTest.java
index 15a1fd43266..8d1f4c5c911 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/GridCustomColumnDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/GridCustomColumnDAOTest.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.generic.server.dataaccess.db;
 
 import java.util.List;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/GridCustomFilterDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/GridCustomFilterDAOTest.java
index 5d59f85a652..06b1280403e 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/GridCustomFilterDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/GridCustomFilterDAOTest.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.generic.server.dataaccess.db;
 
 import java.util.Collections;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/GroupDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/GroupDAOTest.java
index dde26a97a87..5572e5a8af9 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/GroupDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/GroupDAOTest.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.generic.server.dataaccess.db;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAOTest.java
index 3e327721802..3211941e6ff 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAOTest.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.generic.server.dataaccess.db;
 
 import static ch.systemsx.cisd.openbis.generic.server.dataaccess.db.DAOFactory.USE_NEW_SQL_ENGINE;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/MaterialDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/MaterialDAOTest.java
index 405cec12de6..ccae68df185 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/MaterialDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/MaterialDAOTest.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.generic.server.dataaccess.db;
 
 import static org.testng.AssertJUnit.assertFalse;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/MetaprojectDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/MetaprojectDAOTest.java
index abafc69cf8e..09fa5863291 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/MetaprojectDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/MetaprojectDAOTest.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.generic.server.dataaccess.db;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/OperationExecutionDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/OperationExecutionDAOTest.java
index c5411db0cce..5afcced290a 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/OperationExecutionDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/OperationExecutionDAOTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 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.generic.server.dataaccess.db;
 
 import static ch.systemsx.cisd.openbis.generic.shared.dto.OperationExecutionAvailability.AVAILABLE;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PermIdDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PermIdDAOTest.java
index 1f7dbab25ba..f08b8f8ef5a 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PermIdDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PermIdDAOTest.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.generic.server.dataaccess.db;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonDAOTest.java
index 59f87e4cbec..fa0875587ab 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonDAOTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.server.dataaccess.db;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonalAccessTokenDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonalAccessTokenDAOTest.java
index 4dbde8aa678..19eaf0bbe71 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonalAccessTokenDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonalAccessTokenDAOTest.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.generic.server.dataaccess.db;
 
 import static ch.systemsx.cisd.common.test.AssertionUtil.assertContains;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ProjectDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ProjectDAOTest.java
index 87e08491ea9..518466f292f 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ProjectDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ProjectDAOTest.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.generic.server.dataaccess.db;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PropertyTypeDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PropertyTypeDAOTest.java
index 18afae317c1..6ac931e8a9c 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PropertyTypeDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PropertyTypeDAOTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.server.dataaccess.db;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/QueryDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/QueryDAOTest.java
index ff1536bb2f7..860e31995ac 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/QueryDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/QueryDAOTest.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.generic.server.dataaccess.db;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/RoleAssignmentDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/RoleAssignmentDAOTest.java
index a18dafc9cd0..09b5ab29e4f 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/RoleAssignmentDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/RoleAssignmentDAOTest.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.generic.server.dataaccess.db;
 
 import org.testng.AssertJUnit;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleDAOTest.java
index bb18527e2c8..027b587b564 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleDAOTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.server.dataaccess.db;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleTypeDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleTypeDAOTest.java
index 38d8106df3a..94c1440acf3 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleTypeDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleTypeDAOTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 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.generic.server.dataaccess.db;
 
 import static org.testng.AssertJUnit.assertFalse;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ScriptDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ScriptDAOTest.java
index 36afe2e2792..ef6e53ef300 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ScriptDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ScriptDAOTest.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.generic.server.dataaccess.db;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SqlDataMigrationTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SqlDataMigrationTest.java
index 4d1749e6ce8..d0106671140 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SqlDataMigrationTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SqlDataMigrationTest.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.openbis.generic.server.dataaccess.db;
 
 import java.io.File;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SqlMigrationTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SqlMigrationTest.java
index a2030cc7e3a..dfef14349bb 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SqlMigrationTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SqlMigrationTest.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.generic.server.dataaccess.db;
 
 import ch.systemsx.cisd.dbmigration.migration.SqlMigrationTestAbstract;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/VocabularyDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/VocabularyDAOTest.java
index 1792cd64498..1ceb639a0d5 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/VocabularyDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/VocabularyDAOTest.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.generic.server.dataaccess.db;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/scalability/DBCreator.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/scalability/DBCreator.java
index 15f456c46bb..bcd93b77fe7 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/scalability/DBCreator.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/scalability/DBCreator.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.generic.server.dataaccess.db.scalability;
 
 import static org.testng.AssertJUnit.assertNotNull;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/DynamicPropertyEvaluatorDbTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/DynamicPropertyEvaluatorDbTest.java
index 217447d114c..7a4a6af7fd1 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/DynamicPropertyEvaluatorDbTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/DynamicPropertyEvaluatorDbTest.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.generic.server.dataaccess.dynamic_property;
 
 import org.testng.annotations.BeforeMethod;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/DynamicPropertyEvaluatorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/DynamicPropertyEvaluatorTest.java
index 8306a0c1ede..721203a3cfb 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/DynamicPropertyEvaluatorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/DynamicPropertyEvaluatorTest.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.generic.server.dataaccess.dynamic_property;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/DynamicPropertyCalculatorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/DynamicPropertyCalculatorTest.java
index 9aba519a131..7b6f243535a 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/DynamicPropertyCalculatorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/DynamicPropertyCalculatorTest.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.generic.server.dataaccess.dynamic_property.calculator;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/DynamicPropertyFunctionsTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/DynamicPropertyFunctionsTest.java
index 849378e0d0d..a1fbdcb2cbc 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/DynamicPropertyFunctionsTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/DynamicPropertyFunctionsTest.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.generic.server.dataaccess.dynamic_property.calculator;
 
 import org.testng.AssertJUnit;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/event/DeleteDataSetEventBuilderTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/event/DeleteDataSetEventBuilderTest.java
index 90d63de7ede..771198b07bc 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/event/DeleteDataSetEventBuilderTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/event/DeleteDataSetEventBuilderTest.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.generic.server.dataaccess.event;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/event/DeleteDataSetEventParserTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/event/DeleteDataSetEventParserTest.java
index 85ef007c920..55d06908d71 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/event/DeleteDataSetEventParserTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/event/DeleteDataSetEventParserTest.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.generic.server.dataaccess.event;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom023To024Test.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom023To024Test.java
index 00ecf925972..66efffd4d69 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom023To024Test.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom023To024Test.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.generic.server.dataaccess.migration;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom025To026Test.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom025To026Test.java
index 4232b71b09a..636c3d5e187 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom025To026Test.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom025To026Test.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.generic.server.dataaccess.migration;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationTransactionTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationTransactionTest.java
index 9648daba288..564228936e6 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationTransactionTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/MasterDataRegistrationTransactionTest.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.generic.server.jython.api.v1.impl;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/VocabularyTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/VocabularyTest.java
index 1ac0f5e92ac..76a1478d7e1 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/VocabularyTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/jython/api/v1/impl/VocabularyTest.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.generic.server.jython.api.v1.impl;
 
 import junit.framework.TestCase;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/pat/PersonalAccessTokenOpenBisSessionManagerDecoratorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/pat/PersonalAccessTokenOpenBisSessionManagerDecoratorTest.java
index 2d668a12269..5cf6accbada 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/pat/PersonalAccessTokenOpenBisSessionManagerDecoratorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/pat/PersonalAccessTokenOpenBisSessionManagerDecoratorTest.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.generic.server.pat;
 
 import static org.junit.Assert.assertFalse;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/pat/PersonalAccessTokenValidityWarningTaskTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/pat/PersonalAccessTokenValidityWarningTaskTest.java
index 891fd32ef7b..759425c2316 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/pat/PersonalAccessTokenValidityWarningTaskTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/pat/PersonalAccessTokenValidityWarningTaskTest.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.generic.server.pat;
 
 import java.io.File;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/ArchivingByRequestTaskTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/ArchivingByRequestTaskTest.java
index 2063637c203..4b7394607da 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/ArchivingByRequestTaskTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/ArchivingByRequestTaskTest.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.openbis.generic.server.task;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/DataSetRegistrationSummaryTaskTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/DataSetRegistrationSummaryTaskTest.java
index 6ac5ca0776f..97a90eba63f 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/DataSetRegistrationSummaryTaskTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/DataSetRegistrationSummaryTaskTest.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.generic.server.task;
 
 import static ch.systemsx.cisd.openbis.generic.server.task.DataSetRegistrationSummaryTask.DAYS_OF_MONTH_KEY;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/DynamicPropertyEvaluationTriggeredByMaterialChangeMaintenanceTaskTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/DynamicPropertyEvaluationTriggeredByMaterialChangeMaintenanceTaskTest.java
index f4f704c420f..78fa46090d9 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/DynamicPropertyEvaluationTriggeredByMaterialChangeMaintenanceTaskTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/DynamicPropertyEvaluationTriggeredByMaterialChangeMaintenanceTaskTest.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.generic.server.task;
 
 import static ch.systemsx.cisd.openbis.generic.server.task.DynamicPropertyEvaluationTriggeredByMaterialChangeMaintenanceTask.INITIAL_TIMESTAMP_KEY;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/MaterialExternalDBSyncTaskTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/MaterialExternalDBSyncTaskTest.java
index a2e7f986de6..88f07030943 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/MaterialExternalDBSyncTaskTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/MaterialExternalDBSyncTaskTest.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.generic.server.task;
 
 import static ch.systemsx.cisd.openbis.generic.server.task.MaterialExternalDBSyncTask.INSERT_TIMESTAMP_SQL_KEY;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/PeriodTypeTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/PeriodTypeTest.java
index 3ccfdd4f2d7..5dd6e08dd97 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/PeriodTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/PeriodTypeTest.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.openbis.generic.server.task;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/SessionCleanUpMaintenanceTaskTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/SessionCleanUpMaintenanceTaskTest.java
index cabd635502e..8781640fe76 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/SessionCleanUpMaintenanceTaskTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/SessionCleanUpMaintenanceTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 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.generic.server.task;
 
 import java.io.File;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/SessionWorkspaceCleanUpMaintenanceTaskTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/SessionWorkspaceCleanUpMaintenanceTaskTest.java
index 8b4ec62971e..4a9e23474ce 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/SessionWorkspaceCleanUpMaintenanceTaskTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/SessionWorkspaceCleanUpMaintenanceTaskTest.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.openbis.generic.server.task;
 
 import java.io.File;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/UsageGathererTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/UsageGathererTest.java
index ae4248e9b0e..f47d62f91c7 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/UsageGathererTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/UsageGathererTest.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.openbis.generic.server.task;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/UsageReportingTaskTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/UsageReportingTaskTest.java
index a82a70d563a..3448d4d4b2c 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/UsageReportingTaskTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/UsageReportingTaskTest.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.openbis.generic.server.task;
 
 import java.io.ByteArrayOutputStream;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/UserManagementMaintenanceTaskTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/UserManagementMaintenanceTaskTest.java
index 9b7f4f806fd..6bf9ae71e4b 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/UserManagementMaintenanceTaskTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/UserManagementMaintenanceTaskTest.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.openbis.generic.server.task;
 
 import static ch.systemsx.cisd.common.test.AssertionUtil.assertContains;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/EventsSearchMaintenanceTaskTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/EventsSearchMaintenanceTaskTest.java
index 616ff5e57f6..09b0d8fa31c 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/EventsSearchMaintenanceTaskTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/events_search/EventsSearchMaintenanceTaskTest.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.generic.server.task.events_search;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/util/AnnotationAppliedTestCase.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/util/AnnotationAppliedTestCase.java
index 2a626b8ad09..7ae3abb0043 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/util/AnnotationAppliedTestCase.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/util/AnnotationAppliedTestCase.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.generic.server.util;
 
 import java.lang.annotation.Annotation;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/util/SimpleDateRendererTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/util/SimpleDateRendererTest.java
index 100caf9537a..f2520cb03a8 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/util/SimpleDateRendererTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/util/SimpleDateRendererTest.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.generic.server.util;
 
 import java.util.Calendar;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/util/TestInitializer.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/util/TestInitializer.java
index 0c40b4b1850..d2cdced0d25 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/util/TestInitializer.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/util/TestInitializer.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.generic.server.util;
 
 import ch.systemsx.cisd.dbmigration.DBMigrationEngine;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/util/TimeIntervalChecker.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/util/TimeIntervalChecker.java
index 1096191efd5..a3b6508a152 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/util/TimeIntervalChecker.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/util/TimeIntervalChecker.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.generic.server.util;
 
 import java.sql.Timestamp;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/util/UuidUtilTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/util/UuidUtilTest.java
index 8e277b084d1..a2f7c92d3c7 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/util/UuidUtilTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/util/UuidUtilTest.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.generic.server.util;
 
 import static org.testng.AssertJUnit.assertFalse;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/AbstractServerTestCase.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/AbstractServerTestCase.java
index d64f4c9160d..f767633c1fe 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/AbstractServerTestCase.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/AbstractServerTestCase.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.generic.shared;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/CommonTestUtils.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/CommonTestUtils.java
index 9725d7130e1..2492824f0c6 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/CommonTestUtils.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/CommonTestUtils.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.generic.shared;
 
 import java.io.File;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/DataSetInfoHelperTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/DataSetInfoHelperTest.java
index afada819db0..3b66813a2b7 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/DataSetInfoHelperTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/DataSetInfoHelperTest.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.generic.shared;
 
 import org.apache.commons.lang3.StringUtils;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/INormalizer.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/INormalizer.java
index 4edcd1c2fd0..2b6cbf3e096 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/INormalizer.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/INormalizer.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.generic.shared;
 
 /**
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/ServletParamsParsingTestUtils.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/ServletParamsParsingTestUtils.java
index 58573e023aa..972830fe68f 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/ServletParamsParsingTestUtils.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/ServletParamsParsingTestUtils.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.generic.shared;
 
 import java.util.Collections;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/SessionWorkspaceProviderTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/SessionWorkspaceProviderTest.java
index 7343bb6313c..de3a709d1d5 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/SessionWorkspaceProviderTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/SessionWorkspaceProviderTest.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.generic.shared;
 
 import java.io.File;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/common/json/AbstractGenericObjectMapperTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/common/json/AbstractGenericObjectMapperTest.java
index cd8f1e02e6b..44b6a883df6 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/common/json/AbstractGenericObjectMapperTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/common/json/AbstractGenericObjectMapperTest.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.generic.shared.api.common.json;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/TranslatorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/TranslatorTest.java
index 75381cfa145..56cb94c49f4 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/TranslatorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/TranslatorTest.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.generic.shared.api.v1;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetBuilder.java
index 3b6e8ab1476..c3fc139bdcf 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetBuilder.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.generic.shared.api.v1.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.DataSet.DataSetInitializer;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetTest.java
index d7013b1700e..319492cab0d 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetTest.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.generic.shared.api.v1.dto;
 
 import org.testng.AssertJUnit;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetTypeFilterTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetTypeFilterTest.java
index 6f7c143fa8f..163df7cfea5 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetTypeFilterTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetTypeFilterTest.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.generic.shared.api.v1.dto;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetTypeTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetTypeTest.java
index 85873d8d3a8..4577e465ef0 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetTypeTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetTypeTest.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.generic.shared.api.v1.dto;
 
 import org.testng.AssertJUnit;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SampleBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SampleBuilder.java
index fa9f964ddc5..1c411119939 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SampleBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SampleBuilder.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.generic.shared.api.v1.dto;
 
 import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.EntityRegistrationDetails.EntityRegistrationDetailsInitializer;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SampleTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SampleTest.java
index a1a64681eb1..7e07e2d8db2 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SampleTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SampleTest.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.generic.shared.api.v1.dto;
 
 import java.util.EnumSet;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchCriteriaTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchCriteriaTest.java
index 8393a4c3438..7ccbf1eb7cd 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchCriteriaTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchCriteriaTest.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.generic.shared.api.v1.dto;
 
 import org.testng.AssertJUnit;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/filter/PropertiesBasedDataSetFilterTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/filter/PropertiesBasedDataSetFilterTest.java
index b44306b3bc3..47990c000d0 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/filter/PropertiesBasedDataSetFilterTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/filter/PropertiesBasedDataSetFilterTest.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.generic.shared.api.v1.filter;
 
 import java.util.HashMap;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/filter/TypeBasedDataSetFilterTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/filter/TypeBasedDataSetFilterTest.java
index e9f5fb8d7b1..b2990862a48 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/filter/TypeBasedDataSetFilterTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/filter/TypeBasedDataSetFilterTest.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.generic.shared.api.v1.filter;
 
 import org.testng.AssertJUnit;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/json/GenericObjectMapperTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/json/GenericObjectMapperTest.java
index 05adf15e62f..f5442371774 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/json/GenericObjectMapperTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/json/GenericObjectMapperTest.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.generic.shared.api.v1.json;
 
 import junit.framework.Assert;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/AuthorizationConfigTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/AuthorizationConfigTest.java
index 23c0fd5b3ed..39335d38315 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/AuthorizationConfigTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/AuthorizationConfigTest.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.generic.shared.authorization;
 
 import org.jmock.Expectations;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/BasicURLEncoderTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/BasicURLEncoderTest.java
index 0b5172fa665..047524bb1e0 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/BasicURLEncoderTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/BasicURLEncoderTest.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.generic.shared.basic;
 
 import org.testng.AssertJUnit;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/ExpressionUtilTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/ExpressionUtilTest.java
index 61a4412faff..e169638fd01 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/ExpressionUtilTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/ExpressionUtilTest.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.generic.shared.basic;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/MetaprojectNameTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/MetaprojectNameTest.java
index d556ac6d1d9..729fccb0628 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/MetaprojectNameTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/MetaprojectNameTest.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.generic.shared.basic;
 
 import org.testng.annotations.Test;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/Row.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/Row.java
index 591bd52e2d4..8dc4a846f44 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/Row.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/Row.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.generic.shared.basic;
 
 import java.util.Collections;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/TableModelAppenderTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/TableModelAppenderTest.java
index e21b941c71f..1ce6b9c76d7 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/TableModelAppenderTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/TableModelAppenderTest.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.generic.shared.basic;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/URLMethodWithParametersTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/URLMethodWithParametersTest.java
index 0cdbdd16960..e03febc26c1 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/URLMethodWithParametersTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/URLMethodWithParametersTest.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.generic.shared.basic;
 
 import org.testng.AssertJUnit;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/WebAppsPropertiesTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/WebAppsPropertiesTest.java
index aa9c5ff6174..1a735232255 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/WebAppsPropertiesTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/WebAppsPropertiesTest.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.generic.shared.basic;
 
 import java.io.IOException;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AtomicEntityOperationDetailsTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AtomicEntityOperationDetailsTest.java
index 4f2591a1281..9380f7c3915 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AtomicEntityOperationDetailsTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AtomicEntityOperationDetailsTest.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.generic.shared.basic.dto;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DeletedDataSetLocationTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DeletedDataSetLocationTest.java
index eb8c09c9dd1..a71c8cbaa47 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DeletedDataSetLocationTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DeletedDataSetLocationTest.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.generic.shared.basic.dto;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DssLinkTableCellTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DssLinkTableCellTest.java
index 695db56ce65..d37aa0d42fd 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DssLinkTableCellTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DssLinkTableCellTest.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.generic.shared.basic.dto;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExternalDataLocationNodeTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExternalDataLocationNodeTest.java
index f4574bc5ba9..f8f27a1617e 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExternalDataLocationNodeTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExternalDataLocationNodeTest.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.generic.shared.basic.dto;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/GeneratedImageTableCellTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/GeneratedImageTableCellTest.java
index f373fd46e8b..580e533ba4c 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/GeneratedImageTableCellTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/GeneratedImageTableCellTest.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.generic.shared.basic.dto;
 
 import org.testng.AssertJUnit;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkDataSetUrlTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkDataSetUrlTest.java
index 4ebee8c8d35..fb442efa4d8 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkDataSetUrlTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkDataSetUrlTest.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.generic.shared.basic.dto;
 
 import junit.framework.Assert;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkModelTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkModelTest.java
index 908a9a90d86..238bc07dc71 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkModelTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/LinkModelTest.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.generic.shared.basic.dto;
 
 import java.util.Collections;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialIdentifierTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialIdentifierTest.java
index 6abce027727..401b903c5ae 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialIdentifierTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MaterialIdentifierTest.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.generic.shared.basic.dto;
 
 import org.testng.AssertJUnit;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PrimitiveValueTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PrimitiveValueTest.java
index c3d212a35ec..97d21e6f7c3 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PrimitiveValueTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/PrimitiveValueTest.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.generic.shared.basic.dto;
 
 import org.testng.AssertJUnit;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RoleWithHierarchyTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RoleWithHierarchyTest.java
index 19d96a3e948..9d77879cf22 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RoleWithHierarchyTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RoleWithHierarchyTest.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.generic.shared.basic.dto;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/WebAppTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/WebAppTest.java
index 7c2c27765aa..ca219490954 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/WebAppTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/WebAppTest.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.generic.shared.basic.dto;
 
 import java.util.HashMap;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/AbstractDataSetBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/AbstractDataSetBuilder.java
index 5bd3a215880..9f245944bfa 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/AbstractDataSetBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/AbstractDataSetBuilder.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.generic.shared.basic.dto.builders;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/AbstractEntityTypeBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/AbstractEntityTypeBuilder.java
index 87cc39aa44d..58999d475e0 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/AbstractEntityTypeBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/AbstractEntityTypeBuilder.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.generic.shared.basic.dto.builders;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataType;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/ContainerDataSetBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/ContainerDataSetBuilder.java
index b85e0296244..0950d5bb8e6 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/ContainerDataSetBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/ContainerDataSetBuilder.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.openbis.generic.shared.basic.dto.builders;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AbstractExternalData;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/DataSetBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/DataSetBuilder.java
index 33f6c54bdd2..f7e93a9c6eb 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/DataSetBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/DataSetBuilder.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.generic.shared.basic.dto.builders;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ContainerDataSet;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/DataSetTypeBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/DataSetTypeBuilder.java
index 1087adc79e7..a2bed1b53da 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/DataSetTypeBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/DataSetTypeBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.generic.shared.basic.dto.builders;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/DataStoreBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/DataStoreBuilder.java
index b3b4049b213..b2d438ada5b 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/DataStoreBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/DataStoreBuilder.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.generic.shared.basic.dto.builders;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataStore;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/EntityTypePropertyTypeBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/EntityTypePropertyTypeBuilder.java
index 3a085ab95f3..e33ed6d27fe 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/EntityTypePropertyTypeBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/EntityTypePropertyTypeBuilder.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.generic.shared.basic.dto.builders;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityTypePropertyType;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/ExperimentBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/ExperimentBuilder.java
index d90829c282e..108d82e4197 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/ExperimentBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/ExperimentBuilder.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.generic.shared.basic.dto.builders;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/ExperimentTypeBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/ExperimentTypeBuilder.java
index 2a1027aae1c..f06ec4b3301 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/ExperimentTypeBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/ExperimentTypeBuilder.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.generic.shared.basic.dto.builders;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/LinkDataSetBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/LinkDataSetBuilder.java
index a30cb6d6b05..0b348beb8e9 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/LinkDataSetBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/LinkDataSetBuilder.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.generic.shared.basic.dto.builders;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.PhysicalDataSet;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/MaterialTypeBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/MaterialTypeBuilder.java
index d6140ae205b..85d756a6ff3 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/MaterialTypeBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/MaterialTypeBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.generic.shared.basic.dto.builders;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/PersonBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/PersonBuilder.java
index 46b662759bc..462792cf4da 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/PersonBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/PersonBuilder.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.generic.shared.basic.dto.builders;
 
 import java.util.Date;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/PropertyTypeBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/PropertyTypeBuilder.java
index 44f1fb019bb..feccfbde0f2 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/PropertyTypeBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/PropertyTypeBuilder.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.generic.shared.basic.dto.builders;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/SampleBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/SampleBuilder.java
index a6b25cc702a..4ec2b448994 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/SampleBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/SampleBuilder.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.generic.shared.basic.dto.builders;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/SampleTypeBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/SampleTypeBuilder.java
index 74defa81b85..9446042ba69 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/SampleTypeBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/SampleTypeBuilder.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.generic.shared.basic.dto.builders;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/VocabularyTermBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/VocabularyTermBuilder.java
index 251980543a1..63254092e7d 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/VocabularyTermBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/VocabularyTermBuilder.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.generic.shared.basic.dto.builders;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.VocabularyTerm;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/utils/GroupByMapTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/utils/GroupByMapTest.java
index 29fdbe6b264..a9276d8c802 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/utils/GroupByMapTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/utils/GroupByMapTest.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.generic.shared.basic.utils;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/calculator/StandardFunctionsTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/calculator/StandardFunctionsTest.java
index 25ba53bd582..69cade1c593 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/calculator/StandardFunctionsTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/calculator/StandardFunctionsTest.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.generic.shared.calculator;
 
 import static ch.systemsx.cisd.openbis.generic.shared.calculator.StandardFunctions.DOUBLE_DEFAULT_VALUE;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginScannerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginScannerTest.java
index 8d9514150a6..4b90df6cb09 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginScannerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginScannerTest.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.generic.shared.coreplugin;
 
 import java.io.File;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsInjectorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsInjectorTest.java
index da75322e402..59e53f1c676 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsInjectorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsInjectorTest.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.generic.shared.coreplugin;
 
 import static ch.systemsx.cisd.common.maintenance.MaintenanceTaskUtils.DEFAULT_MAINTENANCE_PLUGINS_PROPERTY_NAME;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsUtilsTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsUtilsTest.java
index e2919d012e1..86aef2bdccc 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsUtilsTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsUtilsTest.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.generic.shared.coreplugin;
 
 import static ch.systemsx.cisd.common.test.RegExConstants.END_QUOTING;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/ModuleEnabledCheckerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/ModuleEnabledCheckerTest.java
index a89b0fddad6..157d9002801 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/ModuleEnabledCheckerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/ModuleEnabledCheckerTest.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.generic.shared.coreplugin;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/webapps/CorePluginRegistratorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/webapps/CorePluginRegistratorTest.java
index a602c38f36f..79b5dbaea71 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/webapps/CorePluginRegistratorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/webapps/CorePluginRegistratorTest.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.generic.shared.coreplugin.webapps;
 
 import java.io.File;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSourceDefinitionTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSourceDefinitionTest.java
index fdc3fa5c3dc..03c3696cd09 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSourceDefinitionTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSourceDefinitionTest.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.generic.shared.dto;
 
 import ch.systemsx.cisd.dbmigration.DatabaseConfigurationContext;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/AbstractEntityTypePEBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/AbstractEntityTypePEBuilder.java
index 422849db805..de11fcb8191 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/AbstractEntityTypePEBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/AbstractEntityTypePEBuilder.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.generic.shared.dto.builders;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.EntityTypePE;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/DatasetDescriptionBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/DatasetDescriptionBuilder.java
index 9c79345a54b..acdf1f6eb7c 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/DatasetDescriptionBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/DatasetDescriptionBuilder.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.generic.shared.dto.builders;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.DatasetDescription;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/EntityTypePropertyTypePEBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/EntityTypePropertyTypePEBuilder.java
index 4fae6fb3c3e..4b755bf12fb 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/EntityTypePropertyTypePEBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/EntityTypePropertyTypePEBuilder.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.generic.shared.dto.builders;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.PluginType;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/ExperimentTypePEBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/ExperimentTypePEBuilder.java
index 84a699e951b..95081948bdf 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/ExperimentTypePEBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/ExperimentTypePEBuilder.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.generic.shared.dto.builders;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentTypePE;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/ExternalDataPEBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/ExternalDataPEBuilder.java
index 664efa54c6d..46b198e8dff 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/ExternalDataPEBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/ExternalDataPEBuilder.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.generic.shared.dto.builders;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/SamplePEBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/SamplePEBuilder.java
index 3873cd55410..3d4bbfd1fb9 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/SamplePEBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/SamplePEBuilder.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.generic.shared.dto.builders;
 
 import ch.systemsx.cisd.openbis.generic.SamplePENoDAO;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/SampleTypePEBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/SampleTypePEBuilder.java
index e56fea05049..a81ece6b6d4 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/SampleTypePEBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/SampleTypePEBuilder.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.generic.shared.dto.builders;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.PropertyTypePE;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/SampleUpdatesDTOBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/SampleUpdatesDTOBuilder.java
index 22b4c7ac7a3..c41b97c0914 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/SampleUpdatesDTOBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/SampleUpdatesDTOBuilder.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.generic.shared.dto.builders;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/ScriptPEBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/ScriptPEBuilder.java
index 4ddab1e3b29..29260a53c7f 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/ScriptPEBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/ScriptPEBuilder.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.generic.shared.dto.builders;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/SpacePEBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/SpacePEBuilder.java
index c39a3a460ca..300d25da5d4 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/SpacePEBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/builders/SpacePEBuilder.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.generic.shared.dto.builders;
 
 import ch.systemsx.cisd.openbis.generic.shared.dto.SpacePE;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/ExperimentIdentifierTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/ExperimentIdentifierTest.java
index 1c712adc558..6530f4feef6 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/ExperimentIdentifierTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/ExperimentIdentifierTest.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.generic.shared.dto.identifier;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/ProjectIdentifierTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/ProjectIdentifierTest.java
index 1877e8f0536..f0e561e345e 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/ProjectIdentifierTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/ProjectIdentifierTest.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.generic.shared.dto.identifier;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifierFactoryTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifierFactoryTest.java
index 638f28e2767..0be0eed259f 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifierFactoryTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifierFactoryTest.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.generic.shared.dto.identifier;
 
 import org.testng.AssertJUnit;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifierTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifierTest.java
index 34cea5fe89a..14bb6c1724b 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifierTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleIdentifierTest.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.generic.shared.dto.identifier;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleOwnerIdentifierTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleOwnerIdentifierTest.java
index a55730a06e3..f0ec60f8d2a 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleOwnerIdentifierTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleOwnerIdentifierTest.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.generic.shared.dto.identifier;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SpaceIdentifierTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SpaceIdentifierTest.java
index 750d4cb5bad..0b3144fc639 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SpaceIdentifierTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SpaceIdentifierTest.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.generic.shared.dto.identifier;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/JythonManagedPropertyEvaluatorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/JythonManagedPropertyEvaluatorTest.java
index 22ae707ee48..bcc569116b5 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/JythonManagedPropertyEvaluatorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/JythonManagedPropertyEvaluatorTest.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.generic.shared.managed_property;
 
 import java.util.HashMap;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/AbstractStructuredPropertyConverterTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/AbstractStructuredPropertyConverterTest.java
index 4e398deac73..928f6bb19ef 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/AbstractStructuredPropertyConverterTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/AbstractStructuredPropertyConverterTest.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.generic.shared.managed_property.structured;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/ElementFactoryTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/ElementFactoryTest.java
index 9ae3503ffbb..c996f21d9d7 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/ElementFactoryTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/ElementFactoryTest.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.generic.shared.managed_property.structured;
 
 import org.testng.AssertJUnit;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/JsonOrXMLStructuredPropertyConverterTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/JsonOrXMLStructuredPropertyConverterTest.java
index 5579b3d6882..39275440e88 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/JsonOrXMLStructuredPropertyConverterTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/JsonOrXMLStructuredPropertyConverterTest.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.generic.shared.managed_property.structured;
 
 import org.testng.annotations.Test;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/JsonStructuredPropertyConverterTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/JsonStructuredPropertyConverterTest.java
index d69bd53ccea..6899e64e304 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/JsonStructuredPropertyConverterTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/JsonStructuredPropertyConverterTest.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.generic.shared.managed_property.structured;
 
 import org.testng.annotations.Test;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/StructuredPropertyConverterPythonTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/StructuredPropertyConverterPythonTest.java
index 1557c0c1125..6db58fdca6c 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/StructuredPropertyConverterPythonTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/StructuredPropertyConverterPythonTest.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.generic.shared.managed_property.structured;
 
 import java.util.List;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/XMLOrJsonStructuredPropertyConverterTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/XMLOrJsonStructuredPropertyConverterTest.java
index ccfeb1a17b1..cfecc2ecd4d 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/XMLOrJsonStructuredPropertyConverterTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/XMLOrJsonStructuredPropertyConverterTest.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.generic.shared.managed_property.structured;
 
 import java.util.List;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/XmlStructuredPropertyConverterTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/XmlStructuredPropertyConverterTest.java
index f4039ee0bfa..86724fb46ac 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/XmlStructuredPropertyConverterTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/structured/XmlStructuredPropertyConverterTest.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.generic.shared.managed_property.structured;
 
 import org.testng.annotations.Test;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/parser/GlobalPropertiesLoaderTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/parser/GlobalPropertiesLoaderTest.java
index 7a97d1ab303..e0e32332936 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/parser/GlobalPropertiesLoaderTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/parser/GlobalPropertiesLoaderTest.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.generic.shared.parser;
 
 import java.io.File;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/parser/NewSampleParserObjectFactoryTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/parser/NewSampleParserObjectFactoryTest.java
index 02b7eb2a464..2b5e49e55f8 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/parser/NewSampleParserObjectFactoryTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/parser/NewSampleParserObjectFactoryTest.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.generic.shared.parser;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/parser/SampleUploadSectionsParserTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/parser/SampleUploadSectionsParserTest.java
index 2814364ef0b..f3628ad54b5 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/parser/SampleUploadSectionsParserTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/parser/SampleUploadSectionsParserTest.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.openbis.generic.shared.parser;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/parser/UpdatedSampleParserObjectFactoryTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/parser/UpdatedSampleParserObjectFactoryTest.java
index 9bb5f1332f7..5258206b646 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/parser/UpdatedSampleParserObjectFactoryTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/parser/UpdatedSampleParserObjectFactoryTest.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.generic.shared.parser;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTranslatorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTranslatorTest.java
index 62f5560a586..8b98b5a4fc0 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTranslatorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataSetTranslatorTest.java
@@ -1,6 +1,18 @@
-/**Copyright 2009 ETH Zuerich,CISD**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.*/
-
+/*
+ * 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.
+ * 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.generic.shared.translator;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.GenericSharedConstants.DATA_STORE_SERVER_WEB_APPLICATION_NAME;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExternalDataManagementSystemTranslatorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExternalDataManagementSystemTranslatorTest.java
index 4c8ecfd70c0..005b14eb997 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExternalDataManagementSystemTranslatorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExternalDataManagementSystemTranslatorTest.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.generic.shared.translator;
 
 import org.testng.AssertJUnit;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/translator/SimpleDataSetHelperTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/translator/SimpleDataSetHelperTest.java
index 4b15f5347b2..e743d2c54ad 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/translator/SimpleDataSetHelperTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/translator/SimpleDataSetHelperTest.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.generic.shared.translator;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/CacheManagerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/CacheManagerTest.java
index 766a8041fd2..ec95a1ab9a7 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/CacheManagerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/CacheManagerTest.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.generic.shared.util;
 
 import java.io.File;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/DataTypeUtilsTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/DataTypeUtilsTest.java
index e9aba90dcd1..b9b51aed903 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/DataTypeUtilsTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/DataTypeUtilsTest.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.generic.shared.util;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataTypeCode.BOOLEAN;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/EntityHelperTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/EntityHelperTest.java
index 0c5d9942da4..c90fa015740 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/EntityHelperTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/EntityHelperTest.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.generic.shared.util;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/ServerUtilsTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/ServerUtilsTest.java
index 508bbc6603f..28d8ed2a38e 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/ServerUtilsTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/ServerUtilsTest.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.generic.shared.util;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/SimplePropertyValidatorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/SimplePropertyValidatorTest.java
index bdedcf33bc1..128baf82904 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/SimplePropertyValidatorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/SimplePropertyValidatorTest.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.generic.shared.util;
 
 import static org.junit.Assert.fail;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/SimpleTableModelBuilderTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/SimpleTableModelBuilderTest.java
index ffe575712b1..8e1804ecc32 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/SimpleTableModelBuilderTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/SimpleTableModelBuilderTest.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.generic.shared.util;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/TestInstanceHostUtils.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/TestInstanceHostUtils.java
index 4c9d242afe5..4e0a16c0a6c 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/TestInstanceHostUtils.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/TestInstanceHostUtils.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.generic.shared.util;
 
 /**
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/TypedTableModelBuilderTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/TypedTableModelBuilderTest.java
index e6f3d88a8a1..483dc95f726 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/TypedTableModelBuilderTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/TypedTableModelBuilderTest.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.generic.shared.util;
 
 import java.io.Serializable;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/WebClientFilesUpdaterTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/WebClientFilesUpdaterTest.java
index 4537f70221a..ef761dc4b6e 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/WebClientFilesUpdaterTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/WebClientFilesUpdaterTest.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.generic.shared.util;
 
 import java.io.File;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/XmlUtilsTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/XmlUtilsTest.java
index 8763fe0e04b..96e18031288 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/XmlUtilsTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/XmlUtilsTest.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.generic.shared.util;
 
 import java.io.IOException;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServerTest.java
index 12c66282c96..ce51e6870d6 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/demo/server/DemoServerTest.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.plugin.demo.server;
 
 import org.testng.annotations.BeforeMethod;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/demo/server/ServerInterfaceRegressionTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/demo/server/ServerInterfaceRegressionTest.java
index a9ff8ff28e8..14476ce9408 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/demo/server/ServerInterfaceRegressionTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/demo/server/ServerInterfaceRegressionTest.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.plugin.demo.server;
 
 import org.testng.annotations.Test;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/PropertyField.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/PropertyField.java
index 9600c9936f9..4062abfe460 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/PropertyField.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/PropertyField.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.plugin.generic.client.web.client.application;
 
 public final class PropertyField
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/CheckDataSet.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/CheckDataSet.java
index e54a0f5da6d..f7808608256 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/CheckDataSet.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/CheckDataSet.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.plugin.generic.client.web.client.application.dataset;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.testframework.AbstractDefaultTestCommand;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/FillDataSetEditForm.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/FillDataSetEditForm.java
index 42f945b3510..9519df51ea6 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/FillDataSetEditForm.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/FillDataSetEditForm.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.plugin.generic.client.web.client.application.dataset;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetEditorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetEditorTest.java
index 2e478251130..ceb5d8ee3f0 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetEditorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetEditorTest.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.plugin.generic.client.web.client.application.dataset;
 
 import com.google.gwt.junit.DoNotRunWith;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewerTest.java
index 1f2867552da..0529b9dad1d 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewerTest.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.plugin.generic.client.web.client.application.dataset;
 
 import com.google.gwt.junit.DoNotRunWith;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/Property.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/Property.java
index 479475d1fcc..65e2539fa0d 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/Property.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/Property.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.plugin.generic.client.web.client.application.dataset;
 
 import junit.framework.Assert;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/CheckExperiment.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/CheckExperiment.java
index 8567abeacef..d395cca2639 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/CheckExperiment.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/CheckExperiment.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.plugin.generic.client.web.client.application.experiment;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.attachment.AttachmentBrowser;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/DownloadAttachment.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/DownloadAttachment.java
index 1df7298730d..eb134489227 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/DownloadAttachment.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/DownloadAttachment.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.plugin.generic.client.web.client.application.experiment;
 
 import com.extjs.gxt.ui.client.widget.grid.Grid;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/FillExperimentEditForm.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/FillExperimentEditForm.java
index caa6ea00bf4..b5710101339 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/FillExperimentEditForm.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/FillExperimentEditForm.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.plugin.generic.client.web.client.application.experiment;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/FillExperimentRegistrationForm.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/FillExperimentRegistrationForm.java
index 6ec26a51c95..f0e3b7adb03 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/FillExperimentRegistrationForm.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/FillExperimentRegistrationForm.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.plugin.generic.client.web.client.application.experiment;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentAttachmentDownloadTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentAttachmentDownloadTest.java
index 3e7144b95f3..a8739189af7 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentAttachmentDownloadTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentAttachmentDownloadTest.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.plugin.generic.client.web.client.application.experiment;
 
 import com.extjs.gxt.ui.client.mvc.AppEvent;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentEditorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentEditorTest.java
index 6360b42cb08..7bea933eeb0 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentEditorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentEditorTest.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.plugin.generic.client.web.client.application.experiment;
 
 import java.util.Date;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentRegistrationTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentRegistrationTest.java
index ccd00a4074a..6711cee12fa 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentRegistrationTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentRegistrationTest.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.plugin.generic.client.web.client.application.experiment;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewerTest.java
index bd05e4e3089..2f798c9a605 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewerTest.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.plugin.generic.client.web.client.application.experiment;
 
 import com.google.gwt.junit.DoNotRunWith;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/Property.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/Property.java
index c7e07a040b9..2469dd9bf19 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/Property.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/Property.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.plugin.generic.client.web.client.application.experiment;
 
 import junit.framework.Assert;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/CheckSample.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/CheckSample.java
index 530e690778f..7e909fa7165 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/CheckSample.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/CheckSample.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.plugin.generic.client.web.client.application.sample;
 
 import static ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.sample.GenericSampleViewer.PROPERTIES_ID_PREFIX;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/FillSampleRegistrationForm.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/FillSampleRegistrationForm.java
index cfe0f55b6ee..f746ee9298a 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/FillSampleRegistrationForm.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/FillSampleRegistrationForm.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.plugin.generic.client.web.client.application.sample;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationTest.java
index 5f917575d33..6cd1d55bffb 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationTest.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.plugin.generic.client.web.client.application.sample;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewerTest.java
index 6397aef9a23..e0ffc3794e5 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewerTest.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.plugin.generic.client.web.client.application.sample;
 
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.TabContent;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ParentsPropertiesSectionBuilderTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ParentsPropertiesSectionBuilderTest.java
index 3c06fa71319..8e371d0e381 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ParentsPropertiesSectionBuilderTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ParentsPropertiesSectionBuilderTest.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.plugin.generic.client.web.client.application.sample;
 
 import java.util.List;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/Property.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/Property.java
index 2c0bb379f24..d6ef6a5356d 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/Property.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/Property.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.plugin.generic.client.web.client.application.sample;
 
 import junit.framework.Assert;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/AttachmentDownloadServletTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/AttachmentDownloadServletTest.java
index a6c5a2807be..28b6ba5b461 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/AttachmentDownloadServletTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/AttachmentDownloadServletTest.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.plugin.generic.client.web.server;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientServiceTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientServiceTest.java
index ce83ca3b141..0b448d6e67b 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientServiceTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientServiceTest.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.plugin.generic.client.web.server;
 
 import java.io.File;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/UpdatedDataSetParserObjectFactoryTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/UpdatedDataSetParserObjectFactoryTest.java
index c9fea975336..54668b60eb2 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/UpdatedDataSetParserObjectFactoryTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/parser/UpdatedDataSetParserObjectFactoryTest.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.plugin.generic.client.web.server.parser;
 
 import java.util.LinkedHashMap;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/EntityExistenceCheckerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/EntityExistenceCheckerTest.java
index 72c1503b96f..ad6ceb6ecbf 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/EntityExistenceCheckerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/EntityExistenceCheckerTest.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.plugin.generic.server;
 
 import static org.hamcrest.CoreMatchers.is;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerDatabaseTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerDatabaseTest.java
index 0e59ec8a330..0b5cf19e548 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerDatabaseTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerDatabaseTest.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.plugin.generic.server;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerTest.java
index aa8df1fd89b..2f8862ffacc 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerTest.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.plugin.generic.server;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/NormalizedSampleIdentifierTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/NormalizedSampleIdentifierTest.java
index d56c5e89323..32ee55e43f0 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/NormalizedSampleIdentifierTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/NormalizedSampleIdentifierTest.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.plugin.generic.server;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/ServerInterfaceRegressionTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/ServerInterfaceRegressionTest.java
index cc191d98a43..bac3bbc0848 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/ServerInterfaceRegressionTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/server/ServerInterfaceRegressionTest.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.plugin.generic.server;
 
 import org.testng.annotations.Test;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/client/web/server/resultset/QueryExpressionProviderTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/client/web/server/resultset/QueryExpressionProviderTest.java
index 0973810575a..d9be14b6c24 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/client/web/server/resultset/QueryExpressionProviderTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/client/web/server/resultset/QueryExpressionProviderTest.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.plugin.query.client.web.server.resultset;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/DAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/DAOTest.java
index d4bc7126e33..2689a620ac6 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/DAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/DAOTest.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.plugin.query.server;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryApiServerJsonTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryApiServerJsonTest.java
index abeab389a84..09c42ff01bd 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryApiServerJsonTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryApiServerJsonTest.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.plugin.query.server;
 
 import java.io.IOException;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryServerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryServerTest.java
index 1af01fe15c8..e642bdbcba1 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryServerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/QueryServerTest.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.plugin.query.server;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/ServerInterfaceRegressionTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/ServerInterfaceRegressionTest.java
index 2e4629dc9a1..8d45d6f2294 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/ServerInterfaceRegressionTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/ServerInterfaceRegressionTest.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.plugin.query.server;
 
 import org.testng.annotations.Test;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServerTest.java
index 05c10b2e419..81cbb98d94f 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServerTest.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.plugin.query.server.api.v1;
 
 import java.io.Serializable;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/QueryAccessControllerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/QueryAccessControllerTest.java
index d4ddde0d5ad..976fa663e2d 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/QueryAccessControllerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/QueryAccessControllerTest.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.plugin.query.server.authorization;
 
 import static org.testng.AssertJUnit.assertFalse;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/DataSetGroupLoaderTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/DataSetGroupLoaderTest.java
index 9798b9d75b0..187cd1473a0 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/DataSetGroupLoaderTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/DataSetGroupLoaderTest.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.plugin.query.server.authorization.resultfilter;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/ExperimentGroupLoaderTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/ExperimentGroupLoaderTest.java
index 0e75b14cc30..e67e9d54120 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/ExperimentGroupLoaderTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/ExperimentGroupLoaderTest.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.plugin.query.server.authorization.resultfilter;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/GroupLoaderFactoryTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/GroupLoaderFactoryTest.java
index f3fff185176..9c927d4458a 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/GroupLoaderFactoryTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/GroupLoaderFactoryTest.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.plugin.query.server.authorization.resultfilter;
 
 import org.jmock.Expectations;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/QueryResultFilterTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/QueryResultFilterTest.java
index afe471bd931..8f8c8b8334d 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/QueryResultFilterTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/QueryResultFilterTest.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.plugin.query.server.authorization.resultfilter;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/SampleGroupLoaderTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/SampleGroupLoaderTest.java
index c95b4d95293..be4d5bfe3f7 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/SampleGroupLoaderTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/authorization/resultfilter/SampleGroupLoaderTest.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.plugin.query.server.authorization.resultfilter;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/shared/translator/QueryTableModelTranslatorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/shared/translator/QueryTableModelTranslatorTest.java
index 6aac55fe771..fc9290199ac 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/shared/translator/QueryTableModelTranslatorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/shared/translator/QueryTableModelTranslatorTest.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.plugin.query.shared.translator;
 
 import java.io.Serializable;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/RemoteApiTestCase.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/RemoteApiTestCase.java
index c142b079209..dd80ee3bfde 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/RemoteApiTestCase.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/RemoteApiTestCase.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.remoteapitest;
 
 import org.eclipse.jetty.server.HttpConfiguration;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/DateBasedSearchesThroughJsonApiTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/DateBasedSearchesThroughJsonApiTest.java
index 9d083fc2e99..e92b0ae3f17 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/DateBasedSearchesThroughJsonApiTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/DateBasedSearchesThroughJsonApiTest.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.remoteapitest.api.v1;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/GeneralInformationChangingServiceJsonApiTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/GeneralInformationChangingServiceJsonApiTest.java
index e2f6f5cea20..de42558e640 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/GeneralInformationChangingServiceJsonApiTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/GeneralInformationChangingServiceJsonApiTest.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.remoteapitest.api.v1;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/GeneralInformationServiceHttpInvokerApiTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/GeneralInformationServiceHttpInvokerApiTest.java
index 8c77ed30a0e..ab41e20818e 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/GeneralInformationServiceHttpInvokerApiTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/GeneralInformationServiceHttpInvokerApiTest.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.remoteapitest.api.v1;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/GeneralInformationServiceJsonApiTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/GeneralInformationServiceJsonApiTest.java
index 1225e66cd19..084875cb8bb 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/GeneralInformationServiceJsonApiTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/GeneralInformationServiceJsonApiTest.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.remoteapitest.api.v1;
 
 import static ch.systemsx.cisd.openbis.generic.server.dataaccess.db.DAOFactory.USE_NEW_SQL_ENGINE;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/QueryApiServerJsonTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/QueryApiServerJsonTest.java
index cfbdf72947e..f73776697fd 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/QueryApiServerJsonTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/QueryApiServerJsonTest.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.remoteapitest.api.v1;
 
 import static org.testng.AssertJUnit.assertNotNull;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/TestJsonServiceFactory.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/TestJsonServiceFactory.java
index edc786ab471..c1cde9d1f5e 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/TestJsonServiceFactory.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/remoteapitest/api/v1/TestJsonServiceFactory.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.remoteapitest.api.v1;
 
 import java.net.MalformedURLException;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/ANewMetadataUITest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/ANewMetadataUITest.java
index dc5916b6563..1fe4e41252d 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/ANewMetadataUITest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/ANewMetadataUITest.java
@@ -1,3 +1,18 @@
+/*
+ * 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.
+ * 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.systemtest;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AbstractAssignmentSampleToExperimentTestCase.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AbstractAssignmentSampleToExperimentTestCase.java
index a95a57570b5..fe0d9918192 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AbstractAssignmentSampleToExperimentTestCase.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AbstractAssignmentSampleToExperimentTestCase.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.systemtest;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AbstractDataSetAssignmentTestCase.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AbstractDataSetAssignmentTestCase.java
index 7454e505038..7e1018b8cde 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AbstractDataSetAssignmentTestCase.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AbstractDataSetAssignmentTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.systemtest;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AbstractEntityDeletionTestCase.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AbstractEntityDeletionTestCase.java
index ec2ae1e37a4..7d7999d6095 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AbstractEntityDeletionTestCase.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AbstractEntityDeletionTestCase.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.systemtest;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignDataSetToExperimentAndSampleTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignDataSetToExperimentAndSampleTest.java
index 3d8e731af4b..40e73e2b14a 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignDataSetToExperimentAndSampleTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignDataSetToExperimentAndSampleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.systemtest;
 
 import org.testng.annotations.Test;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignDataSetToExperimentAndSampleViaDropBoxAPITest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignDataSetToExperimentAndSampleViaDropBoxAPITest.java
index 0bc07232b46..da8c19a7f3a 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignDataSetToExperimentAndSampleViaDropBoxAPITest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignDataSetToExperimentAndSampleViaDropBoxAPITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.systemtest;
 
 import java.util.Collections;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignExperimentToProjectTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignExperimentToProjectTest.java
index 77fe313cab2..9a5b64821bd 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignExperimentToProjectTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignExperimentToProjectTest.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.systemtest;
 
 import static org.hamcrest.CoreMatchers.is;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignProjectToSpaceTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignProjectToSpaceTest.java
index dcb03701d6b..557803c860a 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignProjectToSpaceTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignProjectToSpaceTest.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.systemtest;
 
 import static org.hamcrest.CoreMatchers.is;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignSampleToExperimentTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignSampleToExperimentTest.java
index 93be25ef514..38409d6e074 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignSampleToExperimentTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignSampleToExperimentTest.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.systemtest;
 
 import java.util.List;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignSampleToExperimentViaDropBoxAPITest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignSampleToExperimentViaDropBoxAPITest.java
index a4bdeba04a6..40103c3dad9 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignSampleToExperimentViaDropBoxAPITest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignSampleToExperimentViaDropBoxAPITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 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.systemtest;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignSampleToSpaceTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignSampleToSpaceTest.java
index 0a3dc66e6dd..92f610a3e9a 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignSampleToSpaceTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignSampleToSpaceTest.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.systemtest;
 
 import static org.hamcrest.CoreMatchers.is;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AttachmentUploadTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AttachmentUploadTest.java
index 14494385d0c..0b3a33800e7 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AttachmentUploadTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AttachmentUploadTest.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.systemtest;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AuthenticationSystemTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AuthenticationSystemTest.java
index 81c2065e8b0..b24aba20681 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AuthenticationSystemTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AuthenticationSystemTest.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.systemtest;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/BatchMaterialRegistrationAndUpdateTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/BatchMaterialRegistrationAndUpdateTest.java
index 898cd88d944..2b76cbc1142 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/BatchMaterialRegistrationAndUpdateTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/BatchMaterialRegistrationAndUpdateTest.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.systemtest;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/CodeGenerationTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/CodeGenerationTest.java
index a779f375ce0..7fba1f642d9 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/CodeGenerationTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/CodeGenerationTest.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.systemtest;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/CommonServerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/CommonServerTest.java
index a7b5c4b1c88..19231c6417d 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/CommonServerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/CommonServerTest.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.systemtest;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/DataSetListingTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/DataSetListingTest.java
index 63d3d62428e..25e97d76632 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/DataSetListingTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/DataSetListingTest.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.systemtest;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/DataStoreServiceRegistrationTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/DataStoreServiceRegistrationTest.java
index 0b9c2648680..fde60dd77a4 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/DataStoreServiceRegistrationTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/DataStoreServiceRegistrationTest.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.systemtest;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/DeleteDataSetBeforePostRegistrationTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/DeleteDataSetBeforePostRegistrationTest.java
index aa731403282..7605d64d3be 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/DeleteDataSetBeforePostRegistrationTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/DeleteDataSetBeforePostRegistrationTest.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.systemtest;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/DeletionTestCase.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/DeletionTestCase.java
index 7fc7c634b18..d8bc8ce08c9 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/DeletionTestCase.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/DeletionTestCase.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.systemtest;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/EntityDeletionTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/EntityDeletionTest.java
index 52ad4b53fd6..4e3ce0163a2 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/EntityDeletionTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/EntityDeletionTest.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.systemtest;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/EntityOperationBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/EntityOperationBuilder.java
index 5b07b51a58d..aa8d12c4994 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/EntityOperationBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/EntityOperationBuilder.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.systemtest;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/EntityOperationTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/EntityOperationTest.java
index 110b658fc38..d36b0227d9d 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/EntityOperationTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/EntityOperationTest.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.systemtest;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/ExperimentBrowsingTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/ExperimentBrowsingTest.java
index 9e3e8322704..d5840c5b63c 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/ExperimentBrowsingTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/ExperimentBrowsingTest.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.systemtest;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/FilterSystemTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/FilterSystemTest.java
index 154322c6880..da381748659 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/FilterSystemTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/FilterSystemTest.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.systemtest;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/HistoryRowMapper.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/HistoryRowMapper.java
index d4f3eb48f25..abfd73383fa 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/HistoryRowMapper.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/HistoryRowMapper.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.systemtest;
 
 import java.sql.SQLException;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/PersistentSystemTestCase.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/PersistentSystemTestCase.java
index 5b4a5fa5601..39f787f3243 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/PersistentSystemTestCase.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/PersistentSystemTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 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.systemtest;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/PropertiesHistoryTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/PropertiesHistoryTest.java
index f7658740c59..e9889c84423 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/PropertiesHistoryTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/PropertiesHistoryTest.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.systemtest;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/PropertyHistory.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/PropertyHistory.java
index be87a06f8ca..d0d7e377480 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/PropertyHistory.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/PropertyHistory.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.systemtest;
 
 import java.util.Date;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/RegisterDataSetTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/RegisterDataSetTest.java
index 53826844bae..76b41977e0d 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/RegisterDataSetTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/RegisterDataSetTest.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.systemtest;
 
 import static org.hamcrest.CoreMatchers.equalTo;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/RegisterSampleTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/RegisterSampleTest.java
index 44cece5868a..8b6cf523742 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/RegisterSampleTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/RegisterSampleTest.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.systemtest;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/RelationshipServiceAuthorizationTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/RelationshipServiceAuthorizationTest.java
index 201d801e1c2..c3eb8d0f3cf 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/RelationshipServiceAuthorizationTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/RelationshipServiceAuthorizationTest.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.systemtest;
 
 import org.testng.annotations.BeforeMethod;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/SamplesListingTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/SamplesListingTest.java
index bbe0076cb6d..ddecb141171 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/SamplesListingTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/SamplesListingTest.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.systemtest;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/SessionUpdateTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/SessionUpdateTest.java
index 9df921f7139..ced969b3d5f 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/SessionUpdateTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/SessionUpdateTest.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.systemtest;
 
 import static org.testng.AssertJUnit.fail;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/SetSessionUserTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/SetSessionUserTest.java
index 4f92b1ad1e8..f8ecf7ce47f 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/SetSessionUserTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/SetSessionUserTest.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.systemtest;
 
 import static ch.systemsx.cisd.common.test.AssertionUtil.assertContains;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/SystemTestCase.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/SystemTestCase.java
index 7258b89e7cb..35f00bb6c17 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/SystemTestCase.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/SystemTestCase.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.systemtest;
 
 import static org.testng.Assert.assertTrue;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/TypedTableAssertions.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/TypedTableAssertions.java
index a97234a1343..3c5da501949 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/TypedTableAssertions.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/TypedTableAssertions.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.systemtest;
 
 import java.io.Serializable;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UnassignSampleFromExperimentTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UnassignSampleFromExperimentTest.java
index 866b235fd84..3f0acc247d3 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UnassignSampleFromExperimentTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UnassignSampleFromExperimentTest.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.systemtest;
 
 import static org.hamcrest.CoreMatchers.is;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UnassignSampleFromSpaceTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UnassignSampleFromSpaceTest.java
index 14175113471..2e3fd2838f5 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UnassignSampleFromSpaceTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UnassignSampleFromSpaceTest.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.systemtest;
 
 import static org.hamcrest.CoreMatchers.is;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateDataSetContainmentTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateDataSetContainmentTest.java
index 2946cad0651..37732ad8999 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateDataSetContainmentTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateDataSetContainmentTest.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.systemtest;
 
 import org.testng.annotations.BeforeClass;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateDataSetParentsTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateDataSetParentsTest.java
index bb0b70cdd88..4dac6a0f875 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateDataSetParentsTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateDataSetParentsTest.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.systemtest;
 
 import org.testng.annotations.BeforeClass;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateDataSetTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateDataSetTest.java
index dbf31561d7a..1724b599632 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateDataSetTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateDataSetTest.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.systemsx.cisd.openbis.systemtest;
 
 import java.util.Collections;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateSampleContainmentTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateSampleContainmentTest.java
index b9044fe163e..17604d86e3f 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateSampleContainmentTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateSampleContainmentTest.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.systemtest;
 
 import org.testng.annotations.BeforeClass;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateSampleParentsTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateSampleParentsTest.java
index 228e9f069f5..27e238a4650 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateSampleParentsTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateSampleParentsTest.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.systemtest;
 
 import org.testng.annotations.BeforeClass;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateSampleTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateSampleTest.java
index 1081f5322c7..8abc9c88c73 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateSampleTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/UpdateSampleTest.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.systemtest;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/common/json/JsonApiClient.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/common/json/JsonApiClient.java
index 5dd2530d3c4..382aea6a0d7 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/common/json/JsonApiClient.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/common/json/JsonApiClient.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.systemtest.api.common.json;
 
 import com.fasterxml.jackson.databind.JsonNode;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/v1/GeneralInformationChangingServiceTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/v1/GeneralInformationChangingServiceTest.java
index d7dbc4ed192..22e39cdb363 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/v1/GeneralInformationChangingServiceTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/v1/GeneralInformationChangingServiceTest.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.systemtest.api.v1;
 
 import static org.testng.Assert.fail;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/v1/GeneralInformationServiceTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/v1/GeneralInformationServiceTest.java
index c75adeee054..f42ee13ac07 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/v1/GeneralInformationServiceTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/v1/GeneralInformationServiceTest.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.systemtest.api.v1;
 
 import static org.testng.Assert.assertFalse;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/v1/MasterDataRegistrationScriptRunnerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/v1/MasterDataRegistrationScriptRunnerTest.java
index 786c2c14042..c30dd9a9b15 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/v1/MasterDataRegistrationScriptRunnerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/api/v1/MasterDataRegistrationScriptRunnerTest.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.systemtest.api.v1;
 
 import org.testng.annotations.AfterMethod;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/CommonAuthorizationSystemTestService.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/CommonAuthorizationSystemTestService.java
index 57c6a533170..423af402db5 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/CommonAuthorizationSystemTestService.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/CommonAuthorizationSystemTestService.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.systemtest.authorization;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/CommonServerAuthorizationTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/CommonServerAuthorizationTest.java
index 91be8ea0ac7..3fea43eeaac 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/CommonServerAuthorizationTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/CommonServerAuthorizationTest.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.systemtest.authorization;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/ETLServiceAuthorizationTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/ETLServiceAuthorizationTest.java
index 3b472a8ba58..ea7a0276f71 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/ETLServiceAuthorizationTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/ETLServiceAuthorizationTest.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.systemtest.authorization;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/GenericServerAuthorizationTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/GenericServerAuthorizationTest.java
index 62eedc66abd..de74cb67e5b 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/GenericServerAuthorizationTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/GenericServerAuthorizationTest.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.systemtest.authorization;
 
 import java.util.Collections;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/PersonManagementTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/PersonManagementTest.java
index 842ff41067f..399075daab2 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/PersonManagementTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/PersonManagementTest.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.systemtest.authorization;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/ProjectAuthorizationMigrationTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/ProjectAuthorizationMigrationTest.java
index 6bbb7c95f83..ad7ab99376b 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/ProjectAuthorizationMigrationTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/ProjectAuthorizationMigrationTest.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.systemtest.authorization;
 
 import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy.INSTANCE_ADMIN;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/ProjectAuthorizationMigrationTestService.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/ProjectAuthorizationMigrationTestService.java
index 77479f0dbfd..26922e3b210 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/ProjectAuthorizationMigrationTestService.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/ProjectAuthorizationMigrationTestService.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.systemtest.authorization;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/ProjectAuthorizationUser.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/ProjectAuthorizationUser.java
index 300ff6ebef9..167fb4717f8 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/ProjectAuthorizationUser.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/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.systemtest.authorization;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/QueryServerAuthorizationTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/QueryServerAuthorizationTest.java
index fa06b93f34f..3c9fa30afb6 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/QueryServerAuthorizationTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/QueryServerAuthorizationTest.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.systemtest.authorization;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/predicate/dataset/DataSetPredicateTestService.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/predicate/dataset/DataSetPredicateTestService.java
index 01b00a3750c..f03cdf05904 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/predicate/dataset/DataSetPredicateTestService.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/predicate/dataset/DataSetPredicateTestService.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.systemtest.authorization.predicate.dataset;
 
 import java.util.List;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/predicate/deletion/DeletionPredicateTestService.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/predicate/deletion/DeletionPredicateTestService.java
index 6cdd80f8601..40bab8af0c1 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/predicate/deletion/DeletionPredicateTestService.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/predicate/deletion/DeletionPredicateTestService.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.systemtest.authorization.predicate.deletion;
 
 import java.util.List;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/predicate/entity/EntityPredicateTestService.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/predicate/entity/EntityPredicateTestService.java
index 13bd819f0a2..0bc8e3ff504 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/predicate/entity/EntityPredicateTestService.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/predicate/entity/EntityPredicateTestService.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.systemtest.authorization.predicate.entity;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/predicate/experiment/ExperimentPredicateTestService.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/predicate/experiment/ExperimentPredicateTestService.java
index 4a14357df03..4278d6d0c21 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/predicate/experiment/ExperimentPredicateTestService.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/predicate/experiment/ExperimentPredicateTestService.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.systemtest.authorization.predicate.experiment;
 
 import java.util.List;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/predicate/project/ProjectPredicateTestService.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/predicate/project/ProjectPredicateTestService.java
index 96a9327057d..a4899583372 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/predicate/project/ProjectPredicateTestService.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/predicate/project/ProjectPredicateTestService.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.systemtest.authorization.predicate.project;
 
 import java.util.List;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/predicate/sample/SamplePredicateTestService.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/predicate/sample/SamplePredicateTestService.java
index deadd1526e3..1f1a54853e4 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/predicate/sample/SamplePredicateTestService.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/predicate/sample/SamplePredicateTestService.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.systemtest.authorization.predicate.sample;
 
 import java.util.List;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/predicate/space/SpacePredicateTestService.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/predicate/space/SpacePredicateTestService.java
index d303010740d..502a5978dcf 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/predicate/space/SpacePredicateTestService.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/predicate/space/SpacePredicateTestService.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.systemtest.authorization.predicate.space;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/validator/dataset/DataSetValidatorTestService.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/validator/dataset/DataSetValidatorTestService.java
index 8b423b59486..03490c82a10 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/validator/dataset/DataSetValidatorTestService.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/validator/dataset/DataSetValidatorTestService.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.systemtest.authorization.validator.dataset;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/validator/deleteion/DeletionValidatorTestService.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/validator/deleteion/DeletionValidatorTestService.java
index e078b5c2645..033daba9495 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/validator/deleteion/DeletionValidatorTestService.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/validator/deleteion/DeletionValidatorTestService.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.systemtest.authorization.validator.deleteion;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/validator/entity/EntityValidatorTestService.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/validator/entity/EntityValidatorTestService.java
index bed33f218a7..c6c4de68724 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/validator/entity/EntityValidatorTestService.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/validator/entity/EntityValidatorTestService.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.systemtest.authorization.validator.entity;
 
 import java.util.Collections;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/validator/experiment/ExperimentValidatorTestService.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/validator/experiment/ExperimentValidatorTestService.java
index 79824da586d..c472d609bc0 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/validator/experiment/ExperimentValidatorTestService.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/validator/experiment/ExperimentValidatorTestService.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.systemtest.authorization.validator.experiment;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/validator/project/ProjectValidatorTestService.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/validator/project/ProjectValidatorTestService.java
index 25e2faba5d9..b0d87f9686e 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/validator/project/ProjectValidatorTestService.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/validator/project/ProjectValidatorTestService.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.systemtest.authorization.validator.project;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/validator/sample/SampleValidatorTestService.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/validator/sample/SampleValidatorTestService.java
index a872cc77d03..9a71f14615e 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/validator/sample/SampleValidatorTestService.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/validator/sample/SampleValidatorTestService.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.systemtest.authorization.validator.sample;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/validator/space/SpaceValidatorTestService.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/validator/space/SpaceValidatorTestService.java
index 4fdb7a92859..31e17441aea 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/validator/space/SpaceValidatorTestService.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/validator/space/SpaceValidatorTestService.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.systemtest.authorization.validator.space;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/BaseTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/BaseTest.java
index 919f6b25bea..4724360d4be 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/BaseTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/BaseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 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.systemtest.base;
 
 import static org.hamcrest.CoreMatchers.is;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/RelationshipServiceStub.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/RelationshipServiceStub.java
index 5d71be4d594..5404f0ebd5d 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/RelationshipServiceStub.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/RelationshipServiceStub.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.systemtest.base;
 
 import java.util.Map;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/AndAuthorizationRule.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/AndAuthorizationRule.java
index a2a54a0dc4d..9cddcd1171d 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/AndAuthorizationRule.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/AndAuthorizationRule.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.systemtest.base.auth;
 
 import java.util.Map;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/AuthorizationRule.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/AuthorizationRule.java
index 75002e1b2bb..8e3350dcb91 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/AuthorizationRule.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/AuthorizationRule.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.systemtest.base.auth;
 
 import java.util.Map;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/BasicAuthorizationRule.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/BasicAuthorizationRule.java
index a6dcac5e013..dded0fb86e7 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/BasicAuthorizationRule.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/BasicAuthorizationRule.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.systemtest.base.auth;
 
 import java.util.Map;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/GuardedDomain.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/GuardedDomain.java
index 98bb002a347..fadb1d867ab 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/GuardedDomain.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/GuardedDomain.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.systemtest.base.auth;
 
 import java.util.UUID;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/InstanceDomain.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/InstanceDomain.java
index bd64d944b63..31000cabb3c 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/InstanceDomain.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/InstanceDomain.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.systemtest.base.auth;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy.RoleLevel;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/NotAuthorizationRule.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/NotAuthorizationRule.java
index 8eb27bc1a2e..e14571d509c 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/NotAuthorizationRule.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/NotAuthorizationRule.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.systemtest.base.auth;
 
 import java.util.Map;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/OrAuthorizationRule.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/OrAuthorizationRule.java
index 4962b5c51a0..f08416f4e72 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/OrAuthorizationRule.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/OrAuthorizationRule.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.systemtest.base.auth;
 
 import java.util.Map;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/RolePermutator.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/RolePermutator.java
index 2e850062afc..588999a0407 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/RolePermutator.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/RolePermutator.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.systemtest.base.auth;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/SpaceDomain.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/SpaceDomain.java
index 2bc8d9d7b6a..86c74771560 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/SpaceDomain.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/auth/SpaceDomain.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.systemtest.base.auth;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy.RoleLevel;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/Builder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/Builder.java
index d6f1991a870..7ff4bc8bbc3 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/Builder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/Builder.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.systemtest.base.builder;
 
 import ch.systemsx.cisd.openbis.generic.server.ICommonServerForInternalUse;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/DataSetDeletionBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/DataSetDeletionBuilder.java
index 263691130a0..a3a8e50c77d 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/DataSetDeletionBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/DataSetDeletionBuilder.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.systemtest.base.builder;
 
 import java.util.Collections;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/DataSetUpdateBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/DataSetUpdateBuilder.java
index cc16956e0b2..0ddc34a0073 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/DataSetUpdateBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/DataSetUpdateBuilder.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.systemtest.base.builder;
 
 import static ch.systemsx.cisd.openbis.systemtest.base.BaseTest.id;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/ExperimentBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/ExperimentBuilder.java
index f92747e96cd..87117c4db4a 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/ExperimentBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/ExperimentBuilder.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.systemtest.base.builder;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/ExperimentUpdateBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/ExperimentUpdateBuilder.java
index 176fb0a81a9..24dda53cb0a 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/ExperimentUpdateBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/ExperimentUpdateBuilder.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.systemtest.base.builder;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/ExternalDataBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/ExternalDataBuilder.java
index df26909f702..906481e5306 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/ExternalDataBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/ExternalDataBuilder.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.systemtest.base.builder;
 
 import static ch.systemsx.cisd.openbis.systemtest.base.BaseTest.id;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/ProjectBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/ProjectBuilder.java
index c78355c4360..b1c2888fce4 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/ProjectBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/ProjectBuilder.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.systemtest.base.builder;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/ProjectUpdateBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/ProjectUpdateBuilder.java
index 349bbb0a74c..5c03cb57f8b 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/ProjectUpdateBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/ProjectUpdateBuilder.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.systemtest.base.builder;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/SampleBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/SampleBuilder.java
index c051bce9d6a..bce315dbbbb 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/SampleBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/SampleBuilder.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.systemtest.base.builder;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/SampleUpdateBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/SampleUpdateBuilder.java
index 317ed55647a..267860eefe0 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/SampleUpdateBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/SampleUpdateBuilder.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.systemtest.base.builder;
 
 import static ch.systemsx.cisd.openbis.systemtest.base.BaseTest.id;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/SessionBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/SessionBuilder.java
index 004300d80fa..5f390023408 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/SessionBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/SessionBuilder.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.systemtest.base.builder;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/SpaceBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/SpaceBuilder.java
index b0e0db847f0..1d4e202d281 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/SpaceBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/SpaceBuilder.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.systemtest.base.builder;
 
 import ch.systemsx.cisd.openbis.generic.server.ICommonServerForInternalUse;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/TrashEmptyBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/TrashEmptyBuilder.java
index d93fe909ee9..3918b1f9da8 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/TrashEmptyBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/TrashEmptyBuilder.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.systemtest.base.builder;
 
 import java.util.List;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/UpdateBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/UpdateBuilder.java
index 987bc4797c6..2edc1cd162e 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/UpdateBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/builder/UpdateBuilder.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.systemtest.base.builder;
 
 import ch.systemsx.cisd.openbis.generic.server.ICommonServerForInternalUse;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/ExternalDataHasChildrenMatcher.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/ExternalDataHasChildrenMatcher.java
index a2e2c5339be..6e3d82e90f0 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/ExternalDataHasChildrenMatcher.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/ExternalDataHasChildrenMatcher.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.systemtest.base.matcher;
 
 import java.util.Collection;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/ExternalDataHasComponentsMatcher.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/ExternalDataHasComponentsMatcher.java
index 05e2b50e1be..8c1dc7d277c 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/ExternalDataHasComponentsMatcher.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/ExternalDataHasComponentsMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 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.systemtest.base.matcher;
 
 import java.util.Collection;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/ExternalDataHasContainerMatcher.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/ExternalDataHasContainerMatcher.java
index 6be3efc37fb..d144444a0c4 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/ExternalDataHasContainerMatcher.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/ExternalDataHasContainerMatcher.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.systemtest.base.matcher;
 
 import java.util.List;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/ExternalDataHasNoSampleMatcher.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/ExternalDataHasNoSampleMatcher.java
index be4ed3052e2..a8ad2008948 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/ExternalDataHasNoSampleMatcher.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/ExternalDataHasNoSampleMatcher.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.systemtest.base.matcher;
 
 import org.hamcrest.Description;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/ExternalDataHasParentsMatcher.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/ExternalDataHasParentsMatcher.java
index da2f6398b31..28f82a3b0da 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/ExternalDataHasParentsMatcher.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/ExternalDataHasParentsMatcher.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.systemtest.base.matcher;
 
 import java.util.HashSet;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/HasNoChildrenMatcher.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/HasNoChildrenMatcher.java
index 527e0759cfd..6837b9bc161 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/HasNoChildrenMatcher.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/HasNoChildrenMatcher.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.systemtest.base.matcher;
 
 import org.hamcrest.Description;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/HasNoContainerMatcher.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/HasNoContainerMatcher.java
index 045307a67e3..67de5f85226 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/HasNoContainerMatcher.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/HasNoContainerMatcher.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.systemtest.base.matcher;
 
 import org.hamcrest.Description;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/HasNoParentMatcher.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/HasNoParentMatcher.java
index 594e215d5c5..3cff9928d59 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/HasNoParentMatcher.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/HasNoParentMatcher.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.systemtest.base.matcher;
 
 import java.util.Collection;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/InExperimentMatcher.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/InExperimentMatcher.java
index 3bd70786c2b..184d84c3728 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/InExperimentMatcher.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/InExperimentMatcher.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.systemtest.base.matcher;
 
 import org.hamcrest.Description;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/InProjectMatcher.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/InProjectMatcher.java
index 7d61c8f90a8..a78bc965ecb 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/InProjectMatcher.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/InProjectMatcher.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.systemtest.base.matcher;
 
 import org.hamcrest.Description;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/InSampleMatcher.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/InSampleMatcher.java
index f1b1646c5d1..e1a683ce98c 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/InSampleMatcher.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/InSampleMatcher.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.systemtest.base.matcher;
 
 import org.hamcrest.Description;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/InSpaceMatcher.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/InSpaceMatcher.java
index 32647c209ae..f1ca8da04eb 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/InSpaceMatcher.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/InSpaceMatcher.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.systemtest.base.matcher;
 
 import org.hamcrest.Description;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/SampleHasContainerMatcher.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/SampleHasContainerMatcher.java
index 3d97a3d728e..cc2ac390c63 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/SampleHasContainerMatcher.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/SampleHasContainerMatcher.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.systemtest.base.matcher;
 
 import org.hamcrest.Description;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/SampleHasParentsMatcher.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/SampleHasParentsMatcher.java
index 6998e52a10c..066d18adc6e 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/SampleHasParentsMatcher.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/matcher/SampleHasParentsMatcher.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.systemtest.base.matcher;
 
 import java.util.Arrays;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/entitygraph/EntityGraphManager.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/entitygraph/EntityGraphManager.java
index e1093bec06a..49662677cfc 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/entitygraph/EntityGraphManager.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/entitygraph/EntityGraphManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.systemtest.entitygraph;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/AbstractServiceConversationProgressListener.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/AbstractServiceConversationProgressListener.java
index 3a6633daca0..cd72996b789 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/AbstractServiceConversationProgressListener.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/AbstractServiceConversationProgressListener.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.systemtest.optimistic_locking;
 
 import org.apache.log4j.Logger;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/DataSetOptimisticLockingTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/DataSetOptimisticLockingTest.java
index f63f34529a3..917eaa438b6 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/DataSetOptimisticLockingTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/DataSetOptimisticLockingTest.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.systemtest.optimistic_locking;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/ExperimentOptimisticLockingTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/ExperimentOptimisticLockingTest.java
index 97dfefb1b8b..97bbc6af7c8 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/ExperimentOptimisticLockingTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/ExperimentOptimisticLockingTest.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.systemtest.optimistic_locking;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadDataSetOptimisticLockingTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadDataSetOptimisticLockingTest.java
index e78e3a10623..9fe8d4cac8b 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadDataSetOptimisticLockingTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadDataSetOptimisticLockingTest.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.systemtest.optimistic_locking;
 
 import static ch.systemsx.cisd.openbis.systemtest.optimistic_locking.ToolBox.USER_ID;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadExperimentOptimisticLockingTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadExperimentOptimisticLockingTest.java
index f543a076f80..4e36c005099 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadExperimentOptimisticLockingTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadExperimentOptimisticLockingTest.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.systemtest.optimistic_locking;
 
 import static ch.systemsx.cisd.openbis.systemtest.optimistic_locking.ToolBox.USER_ID;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadOptimisticLockingTestCase.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadOptimisticLockingTestCase.java
index 502205168e9..97c38f5515f 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadOptimisticLockingTestCase.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadOptimisticLockingTestCase.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.systemtest.optimistic_locking;
 
 import java.lang.reflect.Method;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadProjectOptimisticLockingTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadProjectOptimisticLockingTest.java
index 56c4173f38a..f775c076c56 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadProjectOptimisticLockingTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadProjectOptimisticLockingTest.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.systemtest.optimistic_locking;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadSampleOptimisticLockingTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadSampleOptimisticLockingTest.java
index 2765e6a03ff..7b4f98d52cf 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadSampleOptimisticLockingTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadSampleOptimisticLockingTest.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.systemtest.optimistic_locking;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/OptimisticLockingTestCase.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/OptimisticLockingTestCase.java
index 7ad62fa5fd7..ca4de198e73 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/OptimisticLockingTestCase.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/OptimisticLockingTestCase.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.systemtest.optimistic_locking;
 
 import org.testng.annotations.BeforeMethod;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/ProjectOptimisticLockingTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/ProjectOptimisticLockingTest.java
index b15657a731e..9d72bdeb000 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/ProjectOptimisticLockingTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/ProjectOptimisticLockingTest.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.systemtest.optimistic_locking;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/SampleOptimisticLockingTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/SampleOptimisticLockingTest.java
index 3656c173f4d..07711364c2e 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/SampleOptimisticLockingTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/SampleOptimisticLockingTest.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.systemtest.optimistic_locking;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/ToolBox.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/ToolBox.java
index d3cd30dd939..5f7f0d9fbf6 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/ToolBox.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/ToolBox.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.systemtest.optimistic_locking;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/perform_entity_operations/RegistrationTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/perform_entity_operations/RegistrationTest.java
index 66c452917a7..e68969ed150 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/perform_entity_operations/RegistrationTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/perform_entity_operations/RegistrationTest.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.systemtest.perform_entity_operations;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/DynamicPropertiesEvaluationTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/DynamicPropertiesEvaluationTest.java
index f05e3eb4112..08383b918f7 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/DynamicPropertiesEvaluationTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/DynamicPropertiesEvaluationTest.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.systemtest.plugin.generic;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/EntityValidationTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/EntityValidationTest.java
index 2178ba154a3..8bafa160167 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/EntityValidationTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/EntityValidationTest.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.systemtest.plugin.generic;
 
 import static org.testng.AssertJUnit.assertTrue;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/ExperimentRegistrationTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/ExperimentRegistrationTest.java
index f410cd7553f..ef37e0c55aa 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/ExperimentRegistrationTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/ExperimentRegistrationTest.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.systemtest.plugin.generic;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/FileFormatTypeHeadlessTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/FileFormatTypeHeadlessTest.java
index daed4cd77c3..0eb9113b8d2 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/FileFormatTypeHeadlessTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/FileFormatTypeHeadlessTest.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.systemtest.plugin.generic;
 
 import static ch.systemsx.cisd.openbis.systemtest.TypedTableAssertions.assertColumn;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/GenericSystemTestCase.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/GenericSystemTestCase.java
index 3b1aa94e4d8..23701f98d59 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/GenericSystemTestCase.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/GenericSystemTestCase.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.systemtest.plugin.generic;
 
 import javax.servlet.http.HttpSession;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleBrowsingTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleBrowsingTest.java
index 18319ce2d93..77945cb3024 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleBrowsingTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleBrowsingTest.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.systemtest.plugin.generic;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleDetailsTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleDetailsTest.java
index 0c4379ec71e..8182ed7d80c 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleDetailsTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleDetailsTest.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.systemtest.plugin.generic;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleRegistrationTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleRegistrationTest.java
index ec9f7186750..e59052fcff3 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleRegistrationTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/SampleRegistrationTest.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.systemtest.plugin.generic;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/query/QueryEditingTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/query/QueryEditingTest.java
index bf8a04c1599..df4d71e1bd7 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/query/QueryEditingTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/query/QueryEditingTest.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.systemtest.plugin.query;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/query/QuerySystemTestCase.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/query/QuerySystemTestCase.java
index 9829f4fd886..444e1b4fcdd 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/query/QuerySystemTestCase.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/query/QuerySystemTestCase.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.systemtest.plugin.query;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/AbstractRelationshipsHistory.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/AbstractRelationshipsHistory.java
index 01d7b0997e3..426be03a7f8 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/AbstractRelationshipsHistory.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/AbstractRelationshipsHistory.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.systemtest.relationshipshistory;
 
 import java.util.Date;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/AbstractRelationshipsHistoryMapper.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/AbstractRelationshipsHistoryMapper.java
index 257249677eb..8b33003eacc 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/AbstractRelationshipsHistoryMapper.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/AbstractRelationshipsHistoryMapper.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.systemtest.relationshipshistory;
 
 import java.sql.SQLException;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/AbstractRelationshipsHistoryTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/AbstractRelationshipsHistoryTest.java
index 5f6696c010f..5aefd0186af 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/AbstractRelationshipsHistoryTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/AbstractRelationshipsHistoryTest.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.systemtest.relationshipshistory;
 
 import java.util.List;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/DataSetOwnerRelationshipsHistoryTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/DataSetOwnerRelationshipsHistoryTest.java
index 0c8ad8f3c40..566cdb6b21f 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/DataSetOwnerRelationshipsHistoryTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/DataSetOwnerRelationshipsHistoryTest.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.systemtest.relationshipshistory;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/DataSetRelationshipsHistory.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/DataSetRelationshipsHistory.java
index 307b5a52754..aab5e21af4d 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/DataSetRelationshipsHistory.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/DataSetRelationshipsHistory.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.systemtest.relationshipshistory;
 
 import ch.systemsx.cisd.common.shared.basic.string.StringUtils;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/DataSetRelationshipsHistoryMapper.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/DataSetRelationshipsHistoryMapper.java
index e63876861f4..989a7d6db69 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/DataSetRelationshipsHistoryMapper.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/DataSetRelationshipsHistoryMapper.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.systemtest.relationshipshistory;
 
 import java.sql.SQLException;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/DataSetToDataSetRelationshipsHistoryTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/DataSetToDataSetRelationshipsHistoryTest.java
index 4fa1a242487..e52dd3d7543 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/DataSetToDataSetRelationshipsHistoryTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/DataSetToDataSetRelationshipsHistoryTest.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.systemtest.relationshipshistory;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/ExperimentRelationshipsHistory.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/ExperimentRelationshipsHistory.java
index 51eab6cc36b..8a3c36965e9 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/ExperimentRelationshipsHistory.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/ExperimentRelationshipsHistory.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.systemtest.relationshipshistory;
 
 /**
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/ExperimentRelationshipsHistoryMapper.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/ExperimentRelationshipsHistoryMapper.java
index 8c8cbb9f639..c6766b12433 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/ExperimentRelationshipsHistoryMapper.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/ExperimentRelationshipsHistoryMapper.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.systemtest.relationshipshistory;
 
 import java.sql.SQLException;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/ExperimentSampleRelationshipsHistoryTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/ExperimentSampleRelationshipsHistoryTest.java
index be3d30e9724..cd98124be40 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/ExperimentSampleRelationshipsHistoryTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/ExperimentSampleRelationshipsHistoryTest.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.systemtest.relationshipshistory;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/SampleRelationshipsHistory.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/SampleRelationshipsHistory.java
index 937467084c7..b613527cef8 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/SampleRelationshipsHistory.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/SampleRelationshipsHistory.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.systemtest.relationshipshistory;
 
 import ch.systemsx.cisd.common.shared.basic.string.StringUtils;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/SampleRelationshipsHistoryMapper.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/SampleRelationshipsHistoryMapper.java
index 4c3353e1075..6b9326ca9f8 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/SampleRelationshipsHistoryMapper.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/SampleRelationshipsHistoryMapper.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.systemtest.relationshipshistory;
 
 import java.sql.SQLException;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/SampleToSampleRelationshipsHistoryTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/SampleToSampleRelationshipsHistoryTest.java
index 661bb8bd9bc..ab578070832 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/SampleToSampleRelationshipsHistoryTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/relationshipshistory/SampleToSampleRelationshipsHistoryTest.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.systemtest.relationshipshistory;
 
 import static org.testng.AssertJUnit.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/server/CommonServerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/server/CommonServerTest.java
index c803dd6ab36..eae6dd610ba 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/server/CommonServerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/server/CommonServerTest.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.openbis.systemtest.server;
 
 import java.lang.reflect.Method;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/task/AuthorizationLevel.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/task/AuthorizationLevel.java
index 225e66bfe2b..22f8ca7a42a 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/task/AuthorizationLevel.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/task/AuthorizationLevel.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.openbis.systemtest.task;
 
 import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/task/UserManagerExpectationsBuilder.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/task/UserManagerExpectationsBuilder.java
index fc337b9194f..cace471ab9f 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/task/UserManagerExpectationsBuilder.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/task/UserManagerExpectationsBuilder.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.openbis.systemtest.task;
 
 import static org.testng.Assert.assertEquals;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/task/UserManagerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/task/UserManagerTest.java
index 9a12a1e6bed..d0e7aeefc1d 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/task/UserManagerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/task/UserManagerTest.java
@@ -1,6 +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.
@@ -14,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.systemtest.task;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.create.PersonCreation;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/task/UserManagerTestService.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/task/UserManagerTestService.java
index 1f8c74c79fe..72fea558ac6 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/task/UserManagerTestService.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/task/UserManagerTestService.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.openbis.systemtest.task;
 
 import org.springframework.stereotype.Component;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/util/GeneralInformationServiceUtil.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/util/GeneralInformationServiceUtil.java
index b4eb6809c7c..72c784e5aef 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/util/GeneralInformationServiceUtil.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/util/GeneralInformationServiceUtil.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.util;
 
 import java.util.ArrayList;
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/util/LogRecordingUtils.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/util/LogRecordingUtils.java
index 831d90ebeda..529e165ee30 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/util/LogRecordingUtils.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/util/LogRecordingUtils.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.util;
 
 import org.apache.log4j.Level;
-- 
GitLab