From 085599cd0d7df77a1e8bc2a2ae2daf52acd37a21 Mon Sep 17 00:00:00 2001
From: alaskowski <alaskowski@ethz.ch>
Date: Thu, 16 Feb 2023 10:25:34 +0100
Subject: [PATCH] SSDM-13365: Updated copyright comments in api-openbis-java

---
 .../ch/ethz/sis/openbis/generic/OpenBIS.java     | 16 ++++++++++++++++
 .../ch/ethz/sis/openbis/generic/OpenBISAPI.java  | 15 +++++++++++++++
 .../generic/asapi/v3/IApplicationServerApi.java  |  3 +--
 .../asapi/v3/dto/attachment/Attachment.java      |  2 +-
 .../attachment/create/AttachmentCreation.java    |  3 +--
 .../fetchoptions/AttachmentFetchOptions.java     |  2 +-
 .../fetchoptions/AttachmentSortOptions.java      |  3 +--
 .../v3/dto/attachment/id/AttachmentFileName.java |  3 +--
 .../v3/dto/attachment/id/IAttachmentId.java      |  3 +--
 .../update/AttachmentListUpdateValue.java        |  3 +--
 .../authorizationgroup/AuthorizationGroup.java   |  3 +--
 .../create/AuthorizationGroupCreation.java       |  3 +--
 .../CreateAuthorizationGroupsOperation.java      |  3 +--
 ...CreateAuthorizationGroupsOperationResult.java |  3 +--
 .../AuthorizationGroupDeletionOptions.java       |  3 +--
 .../DeleteAuthorizationGroupsOperation.java      |  3 +--
 ...DeleteAuthorizationGroupsOperationResult.java |  3 +--
 .../AuthorizationGroupFetchOptions.java          |  3 +--
 .../AuthorizationGroupSortOptions.java           |  3 +--
 .../get/GetAuthorizationGroupsOperation.java     |  3 +--
 .../GetAuthorizationGroupsOperationResult.java   |  3 +--
 .../id/AuthorizationGroupPermId.java             |  3 +--
 .../id/IAuthorizationGroupId.java                |  3 +--
 .../search/AuthorizationGroupSearchCriteria.java |  3 +--
 .../SearchAuthorizationGroupsOperation.java      |  3 +--
 ...SearchAuthorizationGroupsOperationResult.java |  3 +--
 .../update/AuthorizationGroupUpdate.java         |  3 +--
 .../UpdateAuthorizationGroupsOperation.java      |  3 +--
 ...UpdateAuthorizationGroupsOperationResult.java |  3 +--
 .../generic/asapi/v3/dto/common/ITableCell.java  |  3 +--
 .../asapi/v3/dto/common/ObjectToString.java      |  3 +--
 .../asapi/v3/dto/common/Relationship.java        |  3 +--
 .../generic/asapi/v3/dto/common/TableColumn.java |  3 +--
 .../asapi/v3/dto/common/TableDoubleCell.java     |  3 +--
 .../asapi/v3/dto/common/TableLongCell.java       |  3 +--
 .../generic/asapi/v3/dto/common/TableModel.java  |  3 +--
 .../asapi/v3/dto/common/TableStringCell.java     |  3 +--
 .../common/create/CreateObjectsOperation.java    |  3 +--
 .../create/CreateObjectsOperationResult.java     |  3 +--
 .../asapi/v3/dto/common/create/ICreation.java    |  3 +--
 .../v3/dto/common/create/IObjectCreation.java    |  3 +--
 .../common/delete/DeleteObjectsOperation.java    |  3 +--
 .../delete/DeleteObjectsOperationResult.java     |  3 +--
 .../DeleteObjectsWithTrashOperationResult.java   |  3 +--
 ...DeleteObjectsWithoutTrashOperationResult.java |  3 +--
 .../v3/dto/common/fetchoptions/CacheMode.java    |  3 +--
 .../common/fetchoptions/EmptyFetchOptions.java   | 15 +++++++++++++++
 .../common/fetchoptions/EntitySortOptions.java   |  3 +--
 .../EntityWithPropertiesSortOptions.java         |  3 +--
 .../v3/dto/common/fetchoptions/FetchIgnore.java  |  3 +--
 .../v3/dto/common/fetchoptions/FetchOptions.java | 15 +++++++++++++++
 .../FetchOptionsToStringBuilder.java             |  3 +--
 .../dto/common/fetchoptions/FetchProperty.java   |  3 +--
 .../fetchoptions/IFetchOptionsMatcher.java       |  3 +--
 .../fetchoptions/IFetchPropertyHandler.java      |  3 +--
 .../v3/dto/common/fetchoptions/SortOptions.java  |  3 +--
 .../v3/dto/common/fetchoptions/SortOrder.java    |  3 +--
 .../dto/common/fetchoptions/SortParameter.java   |  3 +--
 .../v3/dto/common/fetchoptions/Sorting.java      |  3 +--
 .../view/AbstractCollectionView.java             |  3 +--
 .../dto/common/fetchoptions/view/ListView.java   |  3 +--
 .../v3/dto/common/fetchoptions/view/SetView.java |  3 +--
 .../v3/dto/common/get/GetObjectsOperation.java   |  3 +--
 .../get/GetServerInformationOperationResult.java |  3 +--
 .../get/GetServerPublicInformationOperation.java |  3 +--
 ...etServerPublicInformationOperationResult.java |  3 +--
 .../asapi/v3/dto/common/id/CreationId.java       |  2 +-
 .../asapi/v3/dto/common/id/IObjectId.java        |  3 +--
 .../asapi/v3/dto/common/id/ObjectIdentifier.java |  3 +--
 .../asapi/v3/dto/common/id/ObjectPermId.java     |  3 +--
 .../asapi/v3/dto/common/id/ObjectTechId.java     |  3 +--
 .../common/interfaces/IAttachmentsHolder.java    |  3 +--
 .../v3/dto/common/interfaces/ICodeHolder.java    |  3 +--
 .../dto/common/interfaces/ICreationIdHolder.java |  3 +--
 .../common/interfaces/IDataSetCodesHolder.java   |  3 +--
 .../dto/common/interfaces/IDataSetsHolder.java   |  3 +--
 .../common/interfaces/IDescriptionHolder.java    |  3 +--
 .../v3/dto/common/interfaces/IEntityType.java    |  3 +--
 .../dto/common/interfaces/IEntityTypeHolder.java |  3 +--
 .../dto/common/interfaces/IExperimentHolder.java |  3 +--
 .../common/interfaces/IExperimentsHolder.java    |  3 +--
 .../dto/common/interfaces/IIdentifierHolder.java |  3 +--
 .../v3/dto/common/interfaces/ILabelHolder.java   |  3 +--
 .../interfaces/IMaterialPropertiesHolder.java    |  3 +--
 .../dto/common/interfaces/IMaterialsHolder.java  |  3 +--
 .../interfaces/IModificationDateHolder.java      |  3 +--
 .../dto/common/interfaces/IModifierHolder.java   |  3 +--
 .../v3/dto/common/interfaces/INameHolder.java    |  3 +--
 .../v3/dto/common/interfaces/IOwnerHolder.java   |  3 +--
 .../common/interfaces/IParentChildrenHolder.java |  3 +--
 .../v3/dto/common/interfaces/IPermIdHolder.java  |  3 +--
 .../v3/dto/common/interfaces/IProjectHolder.java |  3 +--
 .../dto/common/interfaces/IProjectsHolder.java   |  3 +--
 .../dto/common/interfaces/IPropertiesHolder.java |  3 +--
 .../interfaces/IPropertyAssignmentsHolder.java   |  3 +--
 .../common/interfaces/IPropertyTypeHolder.java   |  3 +--
 .../interfaces/IRegistrationDateHolder.java      |  3 +--
 .../common/interfaces/IRegistratorHolder.java    |  3 +--
 .../v3/dto/common/interfaces/ISampleHolder.java  |  3 +--
 .../v3/dto/common/interfaces/ISamplesHolder.java |  3 +--
 .../interfaces/ISemanticAnnotationsHolder.java   |  3 +--
 .../v3/dto/common/interfaces/ISpaceHolder.java   |  3 +--
 .../v3/dto/common/interfaces/ITagsHolder.java    |  3 +--
 .../interfaces/IValidationPluginHolder.java      |  3 +--
 .../v3/dto/common/operation/IOperation.java      |  3 +--
 .../operation/IOperationExecutionError.java      |  3 +--
 .../operation/IOperationExecutionProgress.java   |  3 +--
 .../dto/common/operation/IOperationResult.java   |  3 +--
 .../search/AbstractCompositeSearchCriteria.java  |  3 +--
 .../common/search/AbstractDateObjectValue.java   |  3 +--
 .../v3/dto/common/search/AbstractDateValue.java  |  3 +--
 .../search/AbstractEntitySearchCriteria.java     |  3 +--
 .../search/AbstractFieldSearchCriteria.java      |  3 +--
 .../dto/common/search/AbstractNumberValue.java   |  3 +--
 .../search/AbstractObjectSearchCriteria.java     |  3 +--
 .../common/search/AbstractSearchCriteria.java    |  3 +--
 .../dto/common/search/AbstractStringValue.java   |  3 +--
 .../v3/dto/common/search/AbstractValue.java      |  3 +--
 .../search/AnyBooleanPropertySearchCriteria.java |  3 +--
 .../search/AnyDatePropertySearchCriteria.java    |  3 +--
 .../common/search/AnyFieldSearchCriteria.java    |  3 +--
 .../search/AnyNumberPropertySearchCriteria.java  |  3 +--
 .../common/search/AnyPropertySearchCriteria.java |  3 +--
 .../search/AnyStringPropertySearchCriteria.java  |  3 +--
 .../v3/dto/common/search/AnyStringValue.java     |  3 +--
 .../search/BooleanFieldSearchCriteria.java       |  3 +--
 .../search/BooleanPropertySearchCriteria.java    |  3 +--
 .../v3/dto/common/search/CodeSearchCriteria.java |  3 +--
 .../dto/common/search/CodesSearchCriteria.java   |  3 +--
 .../search/CollectionFieldSearchCriteria.java    |  3 +--
 ...ntrolledVocabularyPropertySearchCriteria.java |  3 +--
 .../search/DateEarlierThanOrEqualToValue.java    |  3 +--
 .../dto/common/search/DateEarlierThanValue.java  |  3 +--
 .../v3/dto/common/search/DateEqualToValue.java   |  3 +--
 .../common/search/DateFieldSearchCriteria.java   |  3 +--
 .../search/DateLaterThanOrEqualToValue.java      |  3 +--
 .../v3/dto/common/search/DateLaterThanValue.java |  3 +--
 .../DateObjectEarlierThanOrEqualToValue.java     |  3 +--
 .../search/DateObjectEarlierThanValue.java       |  3 +--
 .../common/search/DateObjectEqualToValue.java    |  3 +--
 .../common/search/DateObjectLaterThanValue.java  |  3 +--
 .../search/DatePropertySearchCriteria.java       |  3 +--
 .../common/search/DescriptionSearchCriteria.java |  3 +--
 .../common/search/EnumFieldSearchCriteria.java   |  3 +--
 .../asapi/v3/dto/common/search/IDate.java        |  3 +--
 .../asapi/v3/dto/common/search/IDateFormat.java  |  3 +--
 .../v3/dto/common/search/ISearchCriteria.java    |  3 +--
 .../asapi/v3/dto/common/search/ITimeZone.java    |  3 +--
 .../v3/dto/common/search/IdSearchCriteria.java   |  3 +--
 .../common/search/IdentifierSearchCriteria.java  |  3 +--
 .../v3/dto/common/search/IdsSearchCriteria.java  |  3 +--
 .../v3/dto/common/search/LongDateFormat.java     |  3 +--
 .../search/ModificationDateSearchCriteria.java   |  3 +--
 .../v3/dto/common/search/NameSearchCriteria.java |  3 +--
 .../v3/dto/common/search/NormalDateFormat.java   |  3 +--
 .../v3/dto/common/search/NumberEqualToValue.java |  3 +--
 .../common/search/NumberFieldSearchCriteria.java |  3 +--
 .../search/NumberGreaterThanOrEqualToValue.java  |  3 +--
 .../common/search/NumberGreaterThanValue.java    |  3 +--
 .../search/NumberLessThanOrEqualToValue.java     |  3 +--
 .../dto/common/search/NumberLessThanValue.java   |  3 +--
 .../search/NumberPropertySearchCriteria.java     |  3 +--
 .../dto/common/search/PermIdSearchCriteria.java  |  3 +--
 .../search/RegistrationDateSearchCriteria.java   |  3 +--
 .../search/SamplePropertySearchCriteria.java     |  3 +--
 .../search/SearchCriteriaToStringBuilder.java    |  3 +--
 .../v3/dto/common/search/SearchFieldType.java    |  3 +--
 .../common/search/SearchObjectsOperation.java    |  3 +--
 .../search/SearchObjectsOperationResult.java     |  3 +--
 .../v3/dto/common/search/SearchOperator.java     |  3 +--
 .../asapi/v3/dto/common/search/SearchResult.java |  3 +--
 .../v3/dto/common/search/ServerTimeZone.java     |  3 +--
 .../v3/dto/common/search/ShortDateFormat.java    |  3 +--
 .../StrictlyStringPropertySearchCriteria.java    |  3 +--
 .../search/StringContainsExactlyValue.java       |  3 +--
 .../dto/common/search/StringContainsValue.java   |  3 +--
 .../dto/common/search/StringEndsWithValue.java   |  3 +--
 .../v3/dto/common/search/StringEqualToValue.java |  3 +--
 .../common/search/StringFieldSearchCriteria.java |  3 +--
 .../search/StringGreaterThanOrEqualToValue.java  |  3 +--
 .../common/search/StringGreaterThanValue.java    |  3 +--
 .../search/StringLessThanOrEqualToValue.java     |  3 +--
 .../dto/common/search/StringLessThanValue.java   |  3 +--
 .../v3/dto/common/search/StringMatchesValue.java |  3 +--
 .../search/StringPropertySearchCriteria.java     |  3 +--
 .../dto/common/search/StringStartsWithValue.java |  3 +--
 .../dto/common/search/TechIdSearchCriteria.java  |  3 +--
 .../search/TextAttributeSearchCriteria.java      |  3 +--
 .../asapi/v3/dto/common/search/TimeZone.java     |  3 +--
 .../v3/dto/common/update/FieldUpdateValue.java   |  3 +--
 .../v3/dto/common/update/IObjectUpdate.java      |  3 +--
 .../asapi/v3/dto/common/update/IUpdate.java      |  3 +--
 .../v3/dto/common/update/IdListUpdateValue.java  | 15 +++++++++++++++
 .../dto/common/update/ListUpdateMapValues.java   |  3 +--
 .../v3/dto/common/update/ListUpdateValue.java    | 15 +++++++++++++++
 .../v3/dto/common/update/RelationshipUpdate.java |  3 +--
 .../common/update/UpdateObjectsOperation.java    |  3 +--
 .../update/UpdateObjectsOperationResult.java     |  3 +--
 .../asapi/v3/dto/dataset/ArchivingStatus.java    |  3 +--
 .../generic/asapi/v3/dto/dataset/Complete.java   |  3 +--
 .../asapi/v3/dto/dataset/ContentCopy.java        |  2 +-
 .../generic/asapi/v3/dto/dataset/DataSet.java    |  2 +-
 .../asapi/v3/dto/dataset/DataSetKind.java        |  3 +--
 .../asapi/v3/dto/dataset/DataSetType.java        |  2 +-
 .../asapi/v3/dto/dataset/FileFormatType.java     |  2 +-
 .../generic/asapi/v3/dto/dataset/LinkedData.java |  2 +-
 .../asapi/v3/dto/dataset/LocatorType.java        |  2 +-
 .../asapi/v3/dto/dataset/PhysicalData.java       |  2 +-
 .../asapi/v3/dto/dataset/StorageFormat.java      |  2 +-
 .../archive/ArchiveDataSetsOperation.java        |  3 +--
 .../archive/ArchiveDataSetsOperationResult.java  |  3 +--
 .../dataset/archive/DataSetArchiveOptions.java   |  3 +--
 .../dto/dataset/create/ContentCopyCreation.java  |  3 +--
 .../create/CreateDataSetTypesOperation.java      |  3 +--
 .../CreateDataSetTypesOperationResult.java       |  3 +--
 .../dataset/create/CreateDataSetsOperation.java  |  3 +--
 .../create/CreateDataSetsOperationResult.java    |  3 +--
 .../v3/dto/dataset/create/DataSetCreation.java   |  3 +--
 .../dto/dataset/create/DataSetTypeCreation.java  |  3 +--
 .../dto/dataset/create/LinkedDataCreation.java   |  3 +--
 .../dto/dataset/create/PhysicalDataCreation.java |  3 +--
 .../dataset/delete/DataSetDeletionOptions.java   |  3 +--
 .../delete/DataSetTypeDeletionOptions.java       |  3 +--
 .../delete/DeleteDataSetTypesOperation.java      |  3 +--
 .../DeleteDataSetTypesOperationResult.java       |  3 +--
 .../dataset/delete/DeleteDataSetsOperation.java  |  3 +--
 .../delete/DeleteDataSetsOperationResult.java    |  3 +--
 .../fetchoptions/DataSetFetchOptions.java        |  2 +-
 .../dataset/fetchoptions/DataSetSortOptions.java |  3 +--
 .../fetchoptions/DataSetTypeFetchOptions.java    |  2 +-
 .../fetchoptions/DataSetTypeSortOptions.java     |  3 +--
 .../fetchoptions/FileFormatTypeFetchOptions.java |  2 +-
 .../fetchoptions/FileFormatTypeSortOptions.java  |  3 +--
 .../fetchoptions/LinkedDataFetchOptions.java     |  2 +-
 .../fetchoptions/LinkedDataSortOptions.java      |  3 +--
 .../fetchoptions/LocatorTypeFetchOptions.java    |  2 +-
 .../fetchoptions/LocatorTypeSortOptions.java     |  3 +--
 .../fetchoptions/PhysicalDataFetchOptions.java   |  2 +-
 .../fetchoptions/PhysicalDataSortOptions.java    |  3 +--
 .../fetchoptions/StorageFormatFetchOptions.java  |  2 +-
 .../fetchoptions/StorageFormatSortOptions.java   |  3 +--
 .../dataset/get/GetDataSetTypesOperation.java    |  3 +--
 .../get/GetDataSetTypesOperationResult.java      |  3 +--
 .../v3/dto/dataset/get/GetDataSetsOperation.java |  3 +--
 .../dataset/get/GetDataSetsOperationResult.java  |  3 +--
 .../dto/dataset/history/DataSetRelationType.java |  3 +--
 .../id/BdsDirectoryStorageFormatPermId.java      |  3 +--
 .../v3/dto/dataset/id/ContentCopyPermId.java     | 15 +++++++++++++++
 .../asapi/v3/dto/dataset/id/DataSetPermId.java   |  3 +--
 .../v3/dto/dataset/id/FileFormatTypePermId.java  |  3 +--
 .../asapi/v3/dto/dataset/id/IContentCopyId.java  | 15 +++++++++++++++
 .../asapi/v3/dto/dataset/id/IDataSetId.java      |  3 +--
 .../v3/dto/dataset/id/IFileFormatTypeId.java     |  3 +--
 .../asapi/v3/dto/dataset/id/ILocatorTypeId.java  |  3 +--
 .../v3/dto/dataset/id/IStorageFormatId.java      |  3 +--
 .../v3/dto/dataset/id/LocatorTypePermId.java     |  3 +--
 .../id/ProprietaryStorageFormatPermId.java       |  3 +--
 .../id/RelativeLocationLocatorTypePermId.java    |  3 +--
 .../v3/dto/dataset/id/StorageFormatPermId.java   |  3 +--
 .../v3/dto/dataset/lock/DataSetLockOptions.java  |  3 +--
 .../dto/dataset/lock/LockDataSetsOperation.java  |  3 +--
 .../lock/LockDataSetsOperationResult.java        |  3 +--
 .../search/AbstractDataSetSearchCriteria.java    |  3 +--
 .../search/ArchivingRequestedSearchCriteria.java |  3 +--
 .../dataset/search/CompleteSearchCriteria.java   |  3 +--
 .../search/ContentCopySearchCriteria.java        |  3 +--
 .../search/DataSetChildrenSearchCriteria.java    |  3 +--
 .../search/DataSetContainerSearchCriteria.java   |  3 +--
 .../search/DataSetParentsSearchCriteria.java     |  3 +--
 .../dataset/search/DataSetSearchCriteria.java    |  3 +--
 .../dataset/search/DataSetSearchRelation.java    |  3 +--
 .../search/DataSetTypeSearchCriteria.java        |  3 +--
 .../search/ExternalCodeSearchCriteria.java       |  3 +--
 .../search/ExternalDmsSearchCriteria.java        |  3 +--
 .../search/FileFormatTypeSearchCriteria.java     |  3 +--
 .../search/GitCommitHashSearchCriteria.java      |  3 +--
 .../search/GitRepositoryIdSearchCriteria.java    |  3 +--
 .../dataset/search/LinkedDataSearchCriteria.java |  3 +--
 .../dataset/search/LocationSearchCriteria.java   |  3 +--
 .../search/LocatorTypeSearchCriteria.java        |  3 +--
 .../dto/dataset/search/PathSearchCriteria.java   |  3 +--
 .../search/PhysicalDataSearchCriteria.java       |  3 +--
 .../search/PresentInArchiveSearchCriteria.java   |  3 +--
 .../search/SearchDataSetTypesOperation.java      |  3 +--
 .../SearchDataSetTypesOperationResult.java       |  3 +--
 .../dataset/search/SearchDataSetsOperation.java  |  3 +--
 .../search/SearchDataSetsOperationResult.java    |  3 +--
 .../dataset/search/ShareIdSearchCriteria.java    |  3 +--
 .../dto/dataset/search/SizeSearchCriteria.java   |  3 +--
 .../dataset/search/SpeedHintSearchCriteria.java  |  3 +--
 .../dto/dataset/search/StatusSearchCriteria.java |  3 +--
 .../StorageConfirmationSearchCriteria.java       |  3 +--
 .../search/StorageFormatSearchCriteria.java      |  3 +--
 .../unarchive/DataSetUnarchiveOptions.java       |  3 +--
 .../unarchive/UnarchiveDataSetsOperation.java    |  3 +--
 .../UnarchiveDataSetsOperationResult.java        |  3 +--
 .../dto/dataset/unlock/DataSetUnlockOptions.java |  3 +--
 .../dataset/unlock/UnlockDataSetsOperation.java  |  3 +--
 .../unlock/UnlockDataSetsOperationResult.java    |  3 +--
 .../update/ContentCopyListUpdateValue.java       |  3 +--
 .../v3/dto/dataset/update/DataSetTypeUpdate.java |  3 +--
 .../v3/dto/dataset/update/DataSetUpdate.java     |  3 +--
 .../v3/dto/dataset/update/LinkedDataUpdate.java  |  3 +--
 .../dto/dataset/update/PhysicalDataUpdate.java   |  3 +--
 .../update/UpdateDataSetTypesOperation.java      |  3 +--
 .../UpdateDataSetTypesOperationResult.java       |  3 +--
 .../dataset/update/UpdateDataSetsOperation.java  |  3 +--
 .../update/UpdateDataSetsOperationResult.java    |  3 +--
 .../asapi/v3/dto/datastore/DataStore.java        |  2 +-
 .../fetchoptions/DataStoreFetchOptions.java      |  2 +-
 .../fetchoptions/DataStoreSortOptions.java       |  3 +--
 .../v3/dto/datastore/id/DataStorePermId.java     |  3 +--
 .../asapi/v3/dto/datastore/id/IDataStoreId.java  |  3 +--
 .../search/DataStoreSearchCriteria.java          |  3 +--
 .../search/SearchDataStoresOperation.java        |  3 +--
 .../search/SearchDataStoresOperationResult.java  |  3 +--
 .../deletion/AbstractObjectDeletionOptions.java  |  3 +--
 .../asapi/v3/dto/deletion/DeletedObject.java     |  3 +--
 .../generic/asapi/v3/dto/deletion/Deletion.java  |  2 +-
 .../confirm/ConfirmDeletionsOperation.java       |  3 +--
 .../confirm/ConfirmDeletionsOperationResult.java |  3 +--
 .../fetchoptions/DeletedObjectFetchOptions.java  |  3 +--
 .../fetchoptions/DeletionFetchOptions.java       |  2 +-
 .../fetchoptions/DeletionSortOptions.java        |  3 +--
 .../asapi/v3/dto/deletion/id/DeletionTechId.java |  3 +--
 .../asapi/v3/dto/deletion/id/IDeletionId.java    |  3 +--
 .../revert/RevertDeletionsOperation.java         |  3 +--
 .../revert/RevertDeletionsOperationResult.java   |  3 +--
 .../deletion/search/DeletionSearchCriteria.java  |  3 +--
 .../search/SearchDeletionsOperation.java         |  3 +--
 .../search/SearchDeletionsOperationResult.java   |  3 +--
 .../dto/entity/create/CreateCodesOperation.java  |  3 +--
 .../create/CreateCodesOperationResult.java       |  3 +--
 .../entity/create/CreatePermIdsOperation.java    |  3 +--
 .../create/CreatePermIdsOperationResult.java     |  3 +--
 .../asapi/v3/dto/entitytype/EntityKind.java      |  3 +--
 .../entitytype/create/IEntityTypeCreation.java   |  3 +--
 .../fetchoptions/EntityTypeFetchOptions.java     |  3 +--
 .../fetchoptions/EntityTypeSortOptions.java      |  3 +--
 .../v3/dto/entitytype/id/EntityTypePermId.java   |  3 +--
 .../v3/dto/entitytype/id/IEntityTypeId.java      |  3 +--
 .../search/AbstractEntityTypeSearchCriteria.java |  3 +--
 .../search/EntityKindSearchCriteria.java         |  3 +--
 .../search/EntityTypeSearchCriteria.java         |  3 +--
 .../dto/entitytype/update/IEntityTypeUpdate.java |  3 +--
 .../PropertyAssignmentListUpdateValue.java       |  3 +--
 .../generic/asapi/v3/dto/event/EntityType.java   | 15 +++++++++++++++
 .../generic/asapi/v3/dto/event/Event.java        |  2 +-
 .../generic/asapi/v3/dto/event/EventType.java    | 15 +++++++++++++++
 .../event/fetchoptions/EventFetchOptions.java    |  2 +-
 .../dto/event/fetchoptions/EventSortOptions.java | 15 +++++++++++++++
 .../asapi/v3/dto/event/id/EventTechId.java       | 15 +++++++++++++++
 .../generic/asapi/v3/dto/event/id/IEventId.java  | 15 +++++++++++++++
 .../search/EventDescriptionSearchCriteria.java   |  3 +--
 .../EventEntityProjectIdSearchCriteria.java      |  3 +--
 .../search/EventEntityProjectSearchCriteria.java |  3 +--
 ...ventEntityRegistrationDateSearchCriteria.java |  3 +--
 .../EventEntityRegistratorSearchCriteria.java    |  3 +--
 .../search/EventEntitySpaceIdSearchCriteria.java |  3 +--
 .../search/EventEntitySpaceSearchCriteria.java   |  3 +--
 .../search/EventEntityTypeSearchCriteria.java    |  3 +--
 .../search/EventIdentifierSearchCriteria.java    |  3 +--
 .../event/search/EventReasonSearchCriteria.java  |  3 +--
 .../v3/dto/event/search/EventSearchCriteria.java | 15 +++++++++++++++
 .../event/search/EventTypeSearchCriteria.java    |  3 +--
 .../dto/event/search/SearchEventsOperation.java  |  3 +--
 .../search/SearchEventsOperationResult.java      |  3 +--
 .../asapi/v3/dto/experiment/Experiment.java      |  2 +-
 .../asapi/v3/dto/experiment/ExperimentType.java  |  2 +-
 .../create/CreateExperimentTypesOperation.java   |  3 +--
 .../CreateExperimentTypesOperationResult.java    |  3 +--
 .../create/CreateExperimentsOperation.java       |  3 +--
 .../create/CreateExperimentsOperationResult.java |  3 +--
 .../experiment/create/ExperimentCreation.java    |  3 +--
 .../create/ExperimentTypeCreation.java           |  3 +--
 .../delete/DeleteExperimentTypesOperation.java   |  3 +--
 .../DeleteExperimentTypesOperationResult.java    |  3 +--
 .../delete/DeleteExperimentsOperation.java       |  3 +--
 .../delete/DeleteExperimentsOperationResult.java |  3 +--
 .../delete/ExperimentDeletionOptions.java        |  3 +--
 .../delete/ExperimentTypeDeletionOptions.java    |  3 +--
 .../fetchoptions/ExperimentFetchOptions.java     |  2 +-
 .../fetchoptions/ExperimentSortOptions.java      |  3 +--
 .../fetchoptions/ExperimentTypeFetchOptions.java |  2 +-
 .../fetchoptions/ExperimentTypeSortOptions.java  |  3 +--
 .../get/GetExperimentTypesOperation.java         |  3 +--
 .../get/GetExperimentTypesOperationResult.java   |  3 +--
 .../experiment/get/GetExperimentsOperation.java  |  3 +--
 .../get/GetExperimentsOperationResult.java       |  3 +--
 .../history/ExperimentRelationType.java          |  3 +--
 .../dto/experiment/id/ExperimentIdentifier.java  |  3 +--
 .../v3/dto/experiment/id/ExperimentPermId.java   |  3 +--
 .../v3/dto/experiment/id/IExperimentId.java      |  3 +--
 .../search/ExperimentSearchCriteria.java         |  3 +--
 .../search/ExperimentTypeSearchCriteria.java     |  3 +--
 .../search/NoExperimentSearchCriteria.java       |  3 +--
 .../search/SearchExperimentTypesOperation.java   |  3 +--
 .../SearchExperimentTypesOperationResult.java    |  3 +--
 .../search/SearchExperimentsOperation.java       |  3 +--
 .../search/SearchExperimentsOperationResult.java |  3 +--
 .../experiment/update/ExperimentTypeUpdate.java  |  3 +--
 .../dto/experiment/update/ExperimentUpdate.java  |  3 +--
 .../update/UpdateExperimentTypesOperation.java   |  3 +--
 .../UpdateExperimentTypesOperationResult.java    |  3 +--
 .../update/UpdateExperimentsOperation.java       |  3 +--
 .../update/UpdateExperimentsOperationResult.java |  3 +--
 .../asapi/v3/dto/externaldms/ExternalDms.java    |  2 +-
 .../dto/externaldms/ExternalDmsAddressType.java  | 15 +++++++++++++++
 .../create/CreateExternalDmsOperation.java       |  3 +--
 .../create/CreateExternalDmsOperationResult.java |  3 +--
 .../externaldms/create/ExternalDmsCreation.java  |  3 +--
 .../delete/DeleteExternalDmsOperation.java       |  3 +--
 .../delete/DeleteExternalDmsOperationResult.java |  3 +--
 .../delete/ExternalDmsDeletionOptions.java       | 15 +++++++++++++++
 .../fetchoptions/ExternalDmsFetchOptions.java    |  2 +-
 .../fetchoptions/ExternalDmsSortOptions.java     |  3 +--
 .../externaldms/get/GetExternalDmsOperation.java |  3 +--
 .../get/GetExternalDmsOperationResult.java       |  3 +--
 .../v3/dto/externaldms/id/ExternalDmsPermId.java |  3 +--
 .../v3/dto/externaldms/id/IExternalDmsId.java    |  3 +--
 .../search/AddressSearchCriteria.java            |  3 +--
 .../search/ExternalDmsSearchCriteria.java        |  3 +--
 .../search/ExternalDmsTypeSearchCriteria.java    |  3 +--
 .../externaldms/search/LabelSearchCriteria.java  |  3 +--
 .../search/SearchExternalDmsOperation.java       |  3 +--
 .../search/SearchExternalDmsOperationResult.java |  3 +--
 .../externaldms/update/ExternalDmsUpdate.java    | 15 +++++++++++++++
 .../update/UpdateExternalDmsOperation.java       |  3 +--
 .../update/UpdateExternalDmsOperationResult.java |  3 +--
 .../asapi/v3/dto/global/GlobalSearchObject.java  |  2 +-
 .../GlobalSearchObjectFetchOptions.java          |  2 +-
 .../GlobalSearchObjectSortOptions.java           | 15 +++++++++++++++
 .../global/fetchoptions/MatchFetchOptions.java   |  3 +--
 .../dto/global/search/GlobalSearchCriteria.java  |  3 +--
 .../global/search/GlobalSearchObjectKind.java    |  3 +--
 .../search/GlobalSearchObjectKindCriteria.java   |  3 +--
 .../global/search/GlobalSearchTextCriteria.java  |  3 +--
 .../search/GlobalSearchWildCardsCriteria.java    |  3 +--
 .../global/search/SearchGloballyOperation.java   |  3 +--
 .../search/SearchGloballyOperationResult.java    |  3 +--
 .../v3/dto/history/ContentCopyHistoryEntry.java  |  3 +--
 .../asapi/v3/dto/history/HistoryEntry.java       |  2 +-
 .../asapi/v3/dto/history/IRelationType.java      |  3 +--
 .../v3/dto/history/PropertyHistoryEntry.java     |  3 +--
 .../v3/dto/history/RelationHistoryEntry.java     |  3 +--
 .../fetchoptions/HistoryEntryFetchOptions.java   |  2 +-
 .../fetchoptions/HistoryEntrySortOptions.java    |  3 +--
 .../dto/history/id/UnknownRelatedObjectId.java   |  3 +--
 .../generic/asapi/v3/dto/material/Material.java  |  2 +-
 .../asapi/v3/dto/material/MaterialType.java      |  2 +-
 .../create/CreateMaterialTypesOperation.java     |  3 +--
 .../CreateMaterialTypesOperationResult.java      |  3 +--
 .../create/CreateMaterialsOperation.java         |  3 +--
 .../create/CreateMaterialsOperationResult.java   |  3 +--
 .../v3/dto/material/create/MaterialCreation.java |  3 +--
 .../material/create/MaterialTypeCreation.java    |  3 +--
 .../delete/DeleteMaterialTypesOperation.java     |  3 +--
 .../DeleteMaterialTypesOperationResult.java      |  3 +--
 .../delete/DeleteMaterialsOperation.java         |  3 +--
 .../delete/DeleteMaterialsOperationResult.java   |  3 +--
 .../material/delete/MaterialDeletionOptions.java |  3 +--
 .../delete/MaterialTypeDeletionOptions.java      |  3 +--
 .../fetchoptions/MaterialFetchOptions.java       |  2 +-
 .../fetchoptions/MaterialSortOptions.java        |  3 +--
 .../fetchoptions/MaterialTypeFetchOptions.java   |  2 +-
 .../fetchoptions/MaterialTypeSortOptions.java    |  3 +--
 .../material/get/GetMaterialTypesOperation.java  |  3 +--
 .../get/GetMaterialTypesOperationResult.java     |  3 +--
 .../dto/material/get/GetMaterialsOperation.java  |  3 +--
 .../get/GetMaterialsOperationResult.java         |  3 +--
 .../asapi/v3/dto/material/id/IMaterialId.java    |  3 +--
 .../asapi/v3/dto/material/id/MaterialPermId.java |  3 +--
 .../material/search/MaterialSearchCriteria.java  |  3 +--
 .../search/MaterialTypeSearchCriteria.java       |  3 +--
 .../search/SearchMaterialTypesOperation.java     |  3 +--
 .../SearchMaterialTypesOperationResult.java      |  3 +--
 .../search/SearchMaterialsOperation.java         |  3 +--
 .../search/SearchMaterialsOperationResult.java   |  3 +--
 .../dto/material/update/MaterialTypeUpdate.java  |  3 +--
 .../v3/dto/material/update/MaterialUpdate.java   |  3 +--
 .../update/UpdateMaterialTypesOperation.java     |  3 +--
 .../UpdateMaterialTypesOperationResult.java      |  3 +--
 .../update/UpdateMaterialsOperation.java         |  3 +--
 .../update/UpdateMaterialsOperationResult.java   |  3 +--
 .../dto/objectkindmodification/ObjectKind.java   |  3 +--
 .../ObjectKindModification.java                  |  2 +-
 .../objectkindmodification/OperationKind.java    |  3 +--
 .../ObjectKindModificationFetchOptions.java      |  2 +-
 .../ObjectKindModificationSortOptions.java       |  3 +--
 .../search/ObjectKindCriteria.java               |  3 +--
 .../ObjectKindModificationSearchCriteria.java    |  3 +--
 .../search/OperationKindCriteria.java            |  3 +--
 .../SearchObjectKindModificationsOperation.java  |  3 +--
 ...chObjectKindModificationsOperationResult.java |  3 +--
 .../AbstractOperationExecutionOptions.java       |  3 +--
 .../AsynchronousOperationExecutionOptions.java   |  3 +--
 .../AsynchronousOperationExecutionResults.java   |  3 +--
 .../IOperationExecutionNotification.java         |  3 +--
 .../operation/IOperationExecutionOptions.java    |  3 +--
 .../operation/IOperationExecutionResults.java    |  3 +--
 .../v3/dto/operation/OperationExecution.java     |  2 +-
 .../OperationExecutionAvailability.java          |  3 +--
 .../dto/operation/OperationExecutionDetails.java |  2 +-
 .../OperationExecutionEmailNotification.java     |  3 +--
 .../dto/operation/OperationExecutionError.java   |  3 +--
 .../operation/OperationExecutionProgress.java    |  3 +--
 .../dto/operation/OperationExecutionState.java   |  3 +--
 .../dto/operation/OperationExecutionSummary.java |  2 +-
 .../SynchronousOperationExecutionOptions.java    |  3 +--
 .../SynchronousOperationExecutionResults.java    |  3 +--
 .../DeleteOperationExecutionsOperation.java      |  3 +--
 ...DeleteOperationExecutionsOperationResult.java |  3 +--
 .../OperationExecutionDeletionOptions.java       |  3 +--
 .../OperationExecutionDetailsFetchOptions.java   |  2 +-
 .../OperationExecutionDetailsSortOptions.java    |  3 +--
 .../OperationExecutionFetchOptions.java          |  2 +-
 ...erationExecutionNotificationFetchOptions.java |  3 +--
 ...perationExecutionNotificationSortOptions.java |  3 +--
 .../OperationExecutionSortOptions.java           |  3 +--
 .../OperationExecutionSummaryFetchOptions.java   |  2 +-
 .../OperationExecutionSummarySortOptions.java    |  3 +--
 .../get/GetOperationExecutionsOperation.java     |  3 +--
 .../GetOperationExecutionsOperationResult.java   |  3 +--
 .../dto/operation/id/IOperationExecutionId.java  |  3 +--
 .../operation/id/OperationExecutionPermId.java   |  3 +--
 .../search/OperationExecutionSearchCriteria.java |  3 +--
 .../SearchOperationExecutionsOperation.java      |  3 +--
 ...SearchOperationExecutionsOperationResult.java |  3 +--
 .../update/OperationExecutionUpdate.java         |  3 +--
 .../UpdateOperationExecutionsOperation.java      |  3 +--
 ...UpdateOperationExecutionsOperationResult.java |  3 +--
 .../asapi/v3/dto/pat/PersonalAccessToken.java    |  2 +-
 .../CreatePersonalAccessTokensOperation.java     |  3 +--
 ...reatePersonalAccessTokensOperationResult.java |  3 +--
 .../pat/create/PersonalAccessTokenCreation.java  | 15 +++++++++++++++
 .../DeletePersonalAccessTokensOperation.java     |  3 +--
 ...eletePersonalAccessTokensOperationResult.java |  3 +--
 .../PersonalAccessTokenDeletionOptions.java      |  3 +--
 .../PersonalAccessTokenFetchOptions.java         |  2 +-
 .../PersonalAccessTokenSortOptions.java          |  3 +--
 .../get/GetPersonalAccessTokensOperation.java    |  3 +--
 .../GetPersonalAccessTokensOperationResult.java  |  3 +--
 .../v3/dto/pat/id/IPersonalAccessTokenId.java    |  3 +--
 .../v3/dto/pat/id/PersonalAccessTokenPermId.java | 15 +++++++++++++++
 .../PersonalAccessTokenOwnerSearchCriteria.java  | 15 +++++++++++++++
 .../PersonalAccessTokenSearchCriteria.java       | 15 +++++++++++++++
 ...onalAccessTokenSessionNameSearchCriteria.java | 15 +++++++++++++++
 .../SearchPersonalAccessTokensOperation.java     |  3 +--
 ...earchPersonalAccessTokensOperationResult.java |  3 +--
 .../pat/update/PersonalAccessTokenUpdate.java    | 15 +++++++++++++++
 .../UpdatePersonalAccessTokensOperation.java     |  3 +--
 ...pdatePersonalAccessTokensOperationResult.java |  3 +--
 .../generic/asapi/v3/dto/person/Person.java      |  2 +-
 .../person/create/CreatePersonsOperation.java    |  3 +--
 .../create/CreatePersonsOperationResult.java     |  3 +--
 .../v3/dto/person/create/PersonCreation.java     |  3 +--
 .../person/delete/DeletePersonsOperation.java    |  3 +--
 .../delete/DeletePersonsOperationResult.java     |  3 +--
 .../dto/person/delete/PersonDeletionOptions.java |  3 +--
 .../person/fetchoptions/PersonFetchOptions.java  |  2 +-
 ...rsonFetchOptionsAllWebAppSettingsHandler.java |  3 +--
 .../PersonFetchOptionsWebAppSettingsHandler.java |  3 +--
 .../person/fetchoptions/PersonSortOptions.java   |  3 +--
 .../v3/dto/person/get/GetPersonsOperation.java   |  3 +--
 .../person/get/GetPersonsOperationResult.java    |  3 +--
 .../asapi/v3/dto/person/id/IPersonId.java        |  3 +--
 .../generic/asapi/v3/dto/person/id/Me.java       |  3 +--
 .../asapi/v3/dto/person/id/PersonPermId.java     |  3 +--
 .../dto/person/search/EmailSearchCriteria.java   |  3 +--
 .../person/search/FirstNameSearchCriteria.java   |  3 +--
 .../person/search/LastNameSearchCriteria.java    |  3 +--
 .../person/search/ModifierSearchCriteria.java    |  3 +--
 .../dto/person/search/PersonSearchCriteria.java  |  3 +--
 .../person/search/RegistratorSearchCriteria.java |  3 +--
 .../person/search/SearchPersonsOperation.java    |  3 +--
 .../search/SearchPersonsOperationResult.java     |  3 +--
 .../dto/person/search/UserIdSearchCriteria.java  |  3 +--
 .../dto/person/search/UserIdsSearchCriteria.java |  3 +--
 .../asapi/v3/dto/person/update/PersonUpdate.java |  3 +--
 .../person/update/UpdatePersonsOperation.java    |  3 +--
 .../update/UpdatePersonsOperationResult.java     |  3 +--
 .../generic/asapi/v3/dto/plugin/Plugin.java      |  3 +--
 .../generic/asapi/v3/dto/plugin/PluginKind.java  |  3 +--
 .../generic/asapi/v3/dto/plugin/PluginType.java  |  3 +--
 .../plugin/create/CreatePluginsOperation.java    |  3 +--
 .../create/CreatePluginsOperationResult.java     |  3 +--
 .../v3/dto/plugin/create/PluginCreation.java     |  3 +--
 .../plugin/delete/DeletePluginsOperation.java    |  3 +--
 .../delete/DeletePluginsOperationResult.java     |  3 +--
 .../dto/plugin/delete/PluginDeletionOptions.java |  3 +--
 .../DynamicPropertyPluginEvaluationOptions.java  | 15 +++++++++++++++
 .../DynamicPropertyPluginEvaluationResult.java   | 15 +++++++++++++++
 .../EntityValidationPluginEvaluationOptions.java | 15 +++++++++++++++
 .../EntityValidationPluginEvaluationResult.java  | 15 +++++++++++++++
 .../plugin/evaluate/EvaluatePluginOperation.java |  3 +--
 .../evaluate/EvaluatePluginOperationResult.java  |  3 +--
 .../plugin/evaluate/PluginEvaluationOptions.java | 15 +++++++++++++++
 .../plugin/evaluate/PluginEvaluationResult.java  | 15 +++++++++++++++
 .../plugin/fetchoptions/PluginFetchOptions.java  |  3 +--
 .../plugin/fetchoptions/PluginSortOptions.java   |  3 +--
 .../v3/dto/plugin/get/GetPluginsOperation.java   |  3 +--
 .../plugin/get/GetPluginsOperationResult.java    |  3 +--
 .../asapi/v3/dto/plugin/id/IPluginId.java        |  3 +--
 .../asapi/v3/dto/plugin/id/PluginPermId.java     |  3 +--
 .../plugin/search/PluginKindSearchCriteria.java  |  3 +--
 .../dto/plugin/search/PluginSearchCriteria.java  |  3 +--
 .../plugin/search/PluginTypeSearchCriteria.java  |  3 +--
 .../plugin/search/SearchPluginsOperation.java    |  3 +--
 .../search/SearchPluginsOperationResult.java     |  3 +--
 .../asapi/v3/dto/plugin/update/PluginUpdate.java |  3 +--
 .../plugin/update/UpdatePluginsOperation.java    |  3 +--
 .../update/UpdatePluginsOperationResult.java     |  3 +--
 .../generic/asapi/v3/dto/project/Project.java    |  2 +-
 .../project/create/CreateProjectsOperation.java  |  3 +--
 .../create/CreateProjectsOperationResult.java    |  3 +--
 .../v3/dto/project/create/ProjectCreation.java   |  3 +--
 .../project/delete/DeleteProjectsOperation.java  |  3 +--
 .../delete/DeleteProjectsOperationResult.java    |  3 +--
 .../project/delete/ProjectDeletionOptions.java   |  3 +--
 .../fetchoptions/ProjectFetchOptions.java        |  2 +-
 .../project/fetchoptions/ProjectSortOptions.java |  3 +--
 .../v3/dto/project/get/GetProjectsOperation.java |  3 +--
 .../project/get/GetProjectsOperationResult.java  |  3 +--
 .../dto/project/history/ProjectRelationType.java |  3 +--
 .../asapi/v3/dto/project/id/IProjectId.java      |  3 +--
 .../v3/dto/project/id/ProjectIdentifier.java     |  3 +--
 .../asapi/v3/dto/project/id/ProjectPermId.java   |  3 +--
 .../project/search/NoProjectSearchCriteria.java  |  3 +--
 .../project/search/ProjectSearchCriteria.java    |  3 +--
 .../project/search/SearchProjectsOperation.java  |  3 +--
 .../search/SearchProjectsOperationResult.java    |  3 +--
 .../v3/dto/project/update/ProjectUpdate.java     |  3 +--
 .../project/update/UpdateProjectsOperation.java  |  3 +--
 .../update/UpdateProjectsOperationResult.java    |  3 +--
 .../generic/asapi/v3/dto/property/DataType.java  |  3 +--
 .../v3/dto/property/PropertyAssignment.java      |  2 +-
 .../asapi/v3/dto/property/PropertyType.java      |  2 +-
 .../create/CreatePropertyTypesOperation.java     |  3 +--
 .../CreatePropertyTypesOperationResult.java      |  3 +--
 .../create/PropertyAssignmentCreation.java       |  3 +--
 .../property/create/PropertyTypeCreation.java    |  3 +--
 .../delete/DeletePropertyTypesOperation.java     |  3 +--
 .../DeletePropertyTypesOperationResult.java      |  3 +--
 .../delete/PropertyTypeDeletionOptions.java      |  3 +--
 .../PropertyAssignmentFetchOptions.java          |  2 +-
 .../PropertyAssignmentSortOptions.java           |  3 +--
 .../fetchoptions/PropertyFetchOptions.java       |  3 +--
 .../fetchoptions/PropertyTypeFetchOptions.java   |  2 +-
 .../fetchoptions/PropertyTypeSortOptions.java    |  3 +--
 .../property/get/GetPropertyTypesOperation.java  |  3 +--
 .../get/GetPropertyTypesOperationResult.java     |  3 +--
 .../dto/property/id/IPropertyAssignmentId.java   |  3 +--
 .../v3/dto/property/id/IPropertyTypeId.java      |  3 +--
 .../property/id/PropertyAssignmentPermId.java    |  3 +--
 .../v3/dto/property/id/PropertyTypePermId.java   |  3 +--
 .../search/PropertyAssignmentSearchCriteria.java |  3 +--
 .../search/PropertyTypeSearchCriteria.java       |  3 +--
 .../SearchPropertyAssignmentsOperation.java      |  3 +--
 ...SearchPropertyAssignmentsOperationResult.java |  3 +--
 .../search/SearchPropertyTypesOperation.java     |  3 +--
 .../SearchPropertyTypesOperationResult.java      |  3 +--
 .../dto/property/update/PropertyTypeUpdate.java  |  3 +--
 .../update/UpdatePropertyTypesOperation.java     |  3 +--
 .../UpdatePropertyTypesOperationResult.java      |  3 +--
 .../generic/asapi/v3/dto/query/Query.java        |  2 +-
 .../asapi/v3/dto/query/QueryDatabase.java        |  2 +-
 .../generic/asapi/v3/dto/query/QueryType.java    |  3 +--
 .../dto/query/create/CreateQueriesOperation.java |  3 +--
 .../create/CreateQueriesOperationResult.java     |  3 +--
 .../asapi/v3/dto/query/create/QueryCreation.java |  3 +--
 .../dto/query/delete/DeleteQueriesOperation.java |  3 +--
 .../delete/DeleteQueriesOperationResult.java     |  3 +--
 .../dto/query/delete/QueryDeletionOptions.java   |  3 +--
 .../dto/query/execute/ExecuteQueryOperation.java |  3 +--
 .../execute/ExecuteQueryOperationResult.java     |  3 +--
 .../dto/query/execute/ExecuteSqlOperation.java   |  3 +--
 .../query/execute/ExecuteSqlOperationResult.java |  3 +--
 .../dto/query/execute/QueryExecutionOptions.java |  3 +--
 .../dto/query/execute/SqlExecutionOptions.java   |  3 +--
 .../fetchoptions/QueryDatabaseFetchOptions.java  |  2 +-
 .../fetchoptions/QueryDatabaseSortOptions.java   |  3 +--
 .../query/fetchoptions/QueryFetchOptions.java    |  2 +-
 .../dto/query/fetchoptions/QuerySortOptions.java |  3 +--
 .../v3/dto/query/get/GetQueriesOperation.java    |  3 +--
 .../dto/query/get/GetQueriesOperationResult.java |  3 +--
 .../query/get/GetQueryDatabasesOperation.java    |  3 +--
 .../get/GetQueryDatabasesOperationResult.java    |  3 +--
 .../asapi/v3/dto/query/id/IQueryDatabaseId.java  |  3 +--
 .../generic/asapi/v3/dto/query/id/IQueryId.java  |  3 +--
 .../asapi/v3/dto/query/id/QueryDatabaseName.java |  3 +--
 .../generic/asapi/v3/dto/query/id/QueryName.java |  3 +--
 .../asapi/v3/dto/query/id/QueryTechId.java       |  3 +--
 .../query/search/DatabaseIdSearchCriteria.java   |  3 +--
 .../EntityTypeCodePatternSearchCriteria.java     |  3 +--
 .../search/QueryDatabaseSearchCriteria.java      |  3 +--
 .../v3/dto/query/search/QuerySearchCriteria.java |  3 +--
 .../query/search/QueryTypeSearchCriteria.java    |  3 +--
 .../dto/query/search/SearchQueriesOperation.java |  3 +--
 .../search/SearchQueriesOperationResult.java     |  3 +--
 .../search/SearchQueryDatabasesOperation.java    |  3 +--
 .../SearchQueryDatabasesOperationResult.java     |  3 +--
 .../v3/dto/query/search/SqlSearchCriteria.java   |  3 +--
 .../asapi/v3/dto/query/update/QueryUpdate.java   |  3 +--
 .../dto/query/update/UpdateQueriesOperation.java |  3 +--
 .../update/UpdateQueriesOperationResult.java     |  3 +--
 .../generic/asapi/v3/dto/rights/Right.java       |  3 +--
 .../generic/asapi/v3/dto/rights/Rights.java      |  3 +--
 .../rights/fetchoptions/RightsFetchOptions.java  |  3 +--
 .../v3/dto/rights/get/GetRightsOperation.java    |  3 +--
 .../dto/rights/get/GetRightsOperationResult.java |  3 +--
 .../asapi/v3/dto/roleassignment/Role.java        |  3 +--
 .../v3/dto/roleassignment/RoleAssignment.java    |  3 +--
 .../asapi/v3/dto/roleassignment/RoleLevel.java   |  3 +--
 .../create/CreateRoleAssignmentsOperation.java   |  3 +--
 .../CreateRoleAssignmentsOperationResult.java    |  3 +--
 .../create/RoleAssignmentCreation.java           |  3 +--
 .../delete/DeleteRoleAssignmentsOperation.java   |  3 +--
 .../DeleteRoleAssignmentsOperationResult.java    |  3 +--
 .../delete/RoleAssignmentDeletionOptions.java    |  3 +--
 .../fetchoptions/RoleAssignmentFetchOptions.java |  3 +--
 .../fetchoptions/RoleAssignmentSortOptions.java  |  3 +--
 .../get/GetRoleAssignmentsOperation.java         |  3 +--
 .../get/GetRoleAssignmentsOperationResult.java   |  3 +--
 .../dto/roleassignment/id/IRoleAssignmentId.java |  3 +--
 .../roleassignment/id/RoleAssignmentTechId.java  |  3 +--
 .../search/RoleAssignmentSearchCriteria.java     |  3 +--
 .../search/SearchRoleAssignmentsOperation.java   |  3 +--
 .../SearchRoleAssignmentsOperationResult.java    |  3 +--
 .../generic/asapi/v3/dto/sample/Sample.java      |  2 +-
 .../generic/asapi/v3/dto/sample/SampleType.java  |  2 +-
 .../create/CreateSampleTypesOperation.java       |  3 +--
 .../create/CreateSampleTypesOperationResult.java |  3 +--
 .../sample/create/CreateSamplesOperation.java    |  3 +--
 .../create/CreateSamplesOperationResult.java     |  3 +--
 .../v3/dto/sample/create/SampleTypeCreation.java |  3 +--
 .../delete/DeleteSampleTypesOperation.java       |  3 +--
 .../delete/DeleteSampleTypesOperationResult.java |  3 +--
 .../sample/delete/DeleteSamplesOperation.java    |  3 +--
 .../delete/DeleteSamplesOperationResult.java     |  3 +--
 .../dto/sample/delete/SampleDeletionOptions.java |  3 +--
 .../sample/delete/SampleTypeDeletionOptions.java |  3 +--
 .../sample/fetchoptions/SampleFetchOptions.java  |  2 +-
 .../sample/fetchoptions/SampleSortOptions.java   |  3 +--
 .../fetchoptions/SampleTypeFetchOptions.java     |  2 +-
 .../fetchoptions/SampleTypeSortOptions.java      |  3 +--
 .../dto/sample/get/GetSampleTypesOperation.java  |  3 +--
 .../get/GetSampleTypesOperationResult.java       |  3 +--
 .../v3/dto/sample/get/GetSamplesOperation.java   |  3 +--
 .../sample/get/GetSamplesOperationResult.java    |  3 +--
 .../dto/sample/history/SampleRelationType.java   |  3 +--
 .../asapi/v3/dto/sample/id/ISampleId.java        |  3 +--
 .../v3/dto/sample/id/SampleIdDeserializer.java   |  3 +--
 .../asapi/v3/dto/sample/id/SampleIdentifier.java |  3 +--
 .../asapi/v3/dto/sample/id/SamplePermId.java     |  3 +--
 .../search/AbstractSampleSearchCriteria.java     |  3 +--
 .../search/ListableSampleTypeSearchCriteria.java | 15 +++++++++++++++
 .../search/NoSampleContainerSearchCriteria.java  |  3 +--
 .../sample/search/NoSampleSearchCriteria.java    |  3 +--
 .../search/SampleChildrenSearchCriteria.java     |  3 +--
 .../search/SampleContainerSearchCriteria.java    |  3 +--
 .../search/SampleParentsSearchCriteria.java      |  3 +--
 .../dto/sample/search/SampleSearchCriteria.java  |  3 +--
 .../dto/sample/search/SampleSearchRelation.java  |  3 +--
 .../sample/search/SampleTypeSearchCriteria.java  |  2 +-
 .../search/SearchSampleTypesOperation.java       |  3 +--
 .../search/SearchSampleTypesOperationResult.java |  3 +--
 .../sample/search/SearchSamplesOperation.java    |  3 +--
 .../search/SearchSamplesOperationResult.java     |  3 +--
 .../v3/dto/sample/update/SampleTypeUpdate.java   |  3 +--
 .../asapi/v3/dto/sample/update/SampleUpdate.java |  3 +--
 .../update/UpdateSampleTypesOperation.java       |  3 +--
 .../update/UpdateSampleTypesOperationResult.java |  3 +--
 .../sample/update/UpdateSamplesOperation.java    |  3 +--
 .../update/UpdateSamplesOperationResult.java     |  3 +--
 .../semanticannotation/SemanticAnnotation.java   |  2 +-
 .../CreateSemanticAnnotationsOperation.java      |  3 +--
 ...CreateSemanticAnnotationsOperationResult.java |  3 +--
 .../create/SemanticAnnotationCreation.java       |  3 +--
 .../DeleteSemanticAnnotationsOperation.java      |  3 +--
 ...DeleteSemanticAnnotationsOperationResult.java |  3 +--
 .../SemanticAnnotationDeletionOptions.java       |  3 +--
 .../SemanticAnnotationFetchOptions.java          |  2 +-
 .../SemanticAnnotationSortOptions.java           |  3 +--
 .../get/GetSemanticAnnotationsOperation.java     |  3 +--
 .../GetSemanticAnnotationsOperationResult.java   |  3 +--
 .../id/ISemanticAnnotationId.java                |  3 +--
 .../id/SemanticAnnotationPermId.java             |  3 +--
 .../DescriptorAccessionIdSearchCriteria.java     |  3 +--
 .../DescriptorOntologyIdSearchCriteria.java      |  3 +--
 .../DescriptorOntologyVersionSearchCriteria.java |  3 +--
 .../PredicateAccessionIdSearchCriteria.java      |  3 +--
 .../PredicateOntologyIdSearchCriteria.java       |  3 +--
 .../PredicateOntologyVersionSearchCriteria.java  |  3 +--
 .../SearchSemanticAnnotationsOperation.java      |  3 +--
 ...SearchSemanticAnnotationsOperationResult.java |  3 +--
 .../search/SemanticAnnotationSearchCriteria.java |  3 +--
 .../update/SemanticAnnotationUpdate.java         |  3 +--
 .../UpdateSemanticAnnotationsOperation.java      |  3 +--
 ...UpdateSemanticAnnotationsOperationResult.java |  3 +--
 .../asapi/v3/dto/server/ServerInformation.java   | 15 +++++++++++++++
 .../asapi/v3/dto/service/AggregationService.java |  3 +--
 .../asapi/v3/dto/service/CustomASService.java    |  2 +-
 .../service/CustomASServiceExecutionOptions.java |  3 +--
 .../asapi/v3/dto/service/ProcessingService.java  |  3 +--
 .../asapi/v3/dto/service/ReportingService.java   |  3 +--
 .../v3/dto/service/SearchDomainService.java      |  3 +--
 .../SearchDomainServiceExecutionResult.java      |  3 +--
 .../service/SearchDomainServiceSearchOption.java |  3 +--
 .../AbstractExecutionOptionsWithParameters.java  |  3 +--
 .../AggregationServiceExecutionOptions.java      |  3 +--
 .../ExecuteAggregationServiceOperation.java      |  3 +--
 ...ExecuteAggregationServiceOperationResult.java |  3 +--
 .../execute/ExecuteCustomASServiceOperation.java |  3 +--
 .../ExecuteCustomASServiceOperationResult.java   |  3 +--
 .../ExecuteProcessingServiceOperation.java       |  3 +--
 .../ExecuteProcessingServiceOperationResult.java |  3 +--
 .../ExecuteReportingServiceOperation.java        |  3 +--
 .../ExecuteReportingServiceOperationResult.java  |  3 +--
 .../ExecuteSearchDomainServiceOperation.java     |  3 +--
 ...xecuteSearchDomainServiceOperationResult.java |  3 +--
 .../ProcessingServiceExecutionOptions.java       |  3 +--
 .../ReportingServiceExecutionOptions.java        |  3 +--
 .../SearchDomainServiceExecutionOptions.java     |  3 +--
 .../AggregationServiceFetchOptions.java          |  3 +--
 .../AggregationServiceSortOptions.java           |  3 +--
 .../CustomASServiceFetchOptions.java             |  2 +-
 .../fetchoptions/CustomASServiceSortOptions.java |  3 +--
 .../ProcessingServiceFetchOptions.java           |  3 +--
 .../ProcessingServiceSortOptions.java            |  3 +--
 .../ReportingServiceFetchOptions.java            |  3 +--
 .../ReportingServiceSortOptions.java             |  3 +--
 .../SearchDomainServiceFetchOptions.java         |  3 +--
 .../SearchDomainServiceSortOptions.java          |  3 +--
 .../v3/dto/service/id/CustomASServiceCode.java   |  3 +--
 .../v3/dto/service/id/DssServicePermId.java      |  3 +--
 .../v3/dto/service/id/ICustomASServiceId.java    |  3 +--
 .../asapi/v3/dto/service/id/IDssServiceId.java   |  3 +--
 .../search/AggregationServiceSearchCriteria.java |  3 +--
 .../search/CustomASServiceSearchCriteria.java    |  3 +--
 .../search/ProcessingServiceSearchCriteria.java  |  3 +--
 .../search/ReportingServiceSearchCriteria.java   |  3 +--
 .../SearchAggregationServicesOperation.java      |  3 +--
 ...SearchAggregationServicesOperationResult.java |  3 +--
 .../search/SearchCustomASServicesOperation.java  |  3 +--
 .../SearchCustomASServicesOperationResult.java   |  3 +--
 .../SearchDomainServiceSearchCriteria.java       |  3 +--
 .../SearchProcessingServicesOperation.java       |  3 +--
 .../SearchProcessingServicesOperationResult.java |  3 +--
 .../search/SearchReportingServicesOperation.java |  3 +--
 .../SearchReportingServicesOperationResult.java  |  3 +--
 .../SearchSearchDomainServicesOperation.java     |  3 +--
 ...earchSearchDomainServicesOperationResult.java |  3 +--
 .../asapi/v3/dto/session/SessionInformation.java |  2 +-
 .../SessionInformationFetchOptions.java          |  2 +-
 .../SessionInformationSortOptions.java           |  3 +--
 .../get/GetSessionInformationOperation.java      |  3 +--
 .../GetSessionInformationOperationResult.java    |  3 +--
 .../v3/dto/session/id/ISessionInformationId.java |  3 +--
 .../dto/session/id/SessionInformationPermId.java | 15 +++++++++++++++
 ...onalAccessTokenSessionNameSearchCriteria.java |  3 +--
 ...PersonalAccessTokenSessionSearchCriteria.java |  3 +--
 .../SearchSessionInformationOperation.java       |  3 +--
 .../SearchSessionInformationOperationResult.java |  3 +--
 .../search/SessionInformationSearchCriteria.java |  3 +--
 .../session/search/UserNameSearchCriteria.java   |  3 +--
 .../generic/asapi/v3/dto/space/Space.java        |  2 +-
 .../dto/space/create/CreateSpacesOperation.java  |  3 +--
 .../create/CreateSpacesOperationResult.java      |  3 +--
 .../asapi/v3/dto/space/create/SpaceCreation.java |  3 +--
 .../dto/space/delete/DeleteSpacesOperation.java  |  3 +--
 .../delete/DeleteSpacesOperationResult.java      |  3 +--
 .../dto/space/delete/SpaceDeletionOptions.java   |  3 +--
 .../space/fetchoptions/SpaceFetchOptions.java    |  2 +-
 .../dto/space/fetchoptions/SpaceSortOptions.java |  3 +--
 .../v3/dto/space/get/GetSpacesOperation.java     |  3 +--
 .../dto/space/get/GetSpacesOperationResult.java  |  3 +--
 .../generic/asapi/v3/dto/space/id/ISpaceId.java  |  3 +--
 .../asapi/v3/dto/space/id/SpacePermId.java       |  3 +--
 .../asapi/v3/dto/space/id/SpaceTechId.java       |  3 +--
 .../dto/space/search/NoSpaceSearchCriteria.java  |  3 +--
 .../dto/space/search/SearchSpacesOperation.java  |  3 +--
 .../search/SearchSpacesOperationResult.java      |  3 +--
 .../v3/dto/space/search/SpaceSearchCriteria.java |  3 +--
 .../asapi/v3/dto/space/update/SpaceUpdate.java   |  3 +--
 .../dto/space/update/UpdateSpacesOperation.java  |  3 +--
 .../update/UpdateSpacesOperationResult.java      |  3 +--
 .../openbis/generic/asapi/v3/dto/tag/Tag.java    |  2 +-
 .../v3/dto/tag/create/CreateTagsOperation.java   |  3 +--
 .../tag/create/CreateTagsOperationResult.java    |  3 +--
 .../asapi/v3/dto/tag/create/TagCreation.java     |  3 +--
 .../v3/dto/tag/delete/DeleteTagsOperation.java   |  3 +--
 .../tag/delete/DeleteTagsOperationResult.java    |  3 +--
 .../v3/dto/tag/delete/TagDeletionOptions.java    |  3 +--
 .../v3/dto/tag/fetchoptions/TagFetchOptions.java |  2 +-
 .../v3/dto/tag/fetchoptions/TagSortOptions.java  |  3 +--
 .../asapi/v3/dto/tag/get/GetTagsOperation.java   |  3 +--
 .../v3/dto/tag/get/GetTagsOperationResult.java   |  3 +--
 .../generic/asapi/v3/dto/tag/id/ITagId.java      |  3 +--
 .../generic/asapi/v3/dto/tag/id/TagCode.java     |  3 +--
 .../generic/asapi/v3/dto/tag/id/TagPermId.java   |  3 +--
 .../v3/dto/tag/search/SearchTagsOperation.java   |  3 +--
 .../tag/search/SearchTagsOperationResult.java    |  3 +--
 .../v3/dto/tag/search/TagSearchCriteria.java     |  3 +--
 .../asapi/v3/dto/tag/update/TagUpdate.java       |  3 +--
 .../v3/dto/tag/update/UpdateTagsOperation.java   |  3 +--
 .../tag/update/UpdateTagsOperationResult.java    |  3 +--
 .../asapi/v3/dto/vocabulary/Vocabulary.java      |  2 +-
 .../asapi/v3/dto/vocabulary/VocabularyTerm.java  |  2 +-
 .../create/CreateVocabulariesOperation.java      |  3 +--
 .../CreateVocabulariesOperationResult.java       |  3 +--
 .../create/CreateVocabularyTermsOperation.java   |  3 +--
 .../CreateVocabularyTermsOperationResult.java    |  3 +--
 .../vocabulary/create/VocabularyCreation.java    |  3 +--
 .../create/VocabularyTermCreation.java           |  3 +--
 .../delete/DeleteVocabulariesOperation.java      |  3 +--
 .../DeleteVocabulariesOperationResult.java       |  3 +--
 .../delete/DeleteVocabularyTermsOperation.java   |  3 +--
 .../DeleteVocabularyTermsOperationResult.java    |  3 +--
 .../delete/VocabularyDeletionOptions.java        |  3 +--
 .../delete/VocabularyTermDeletionOptions.java    |  3 +--
 .../delete/VocabularyTermReplacement.java        |  3 +--
 .../fetchoptions/VocabularyFetchOptions.java     |  2 +-
 .../fetchoptions/VocabularySortOptions.java      |  3 +--
 .../fetchoptions/VocabularyTermFetchOptions.java |  2 +-
 .../fetchoptions/VocabularyTermSortOptions.java  |  3 +--
 .../vocabulary/get/GetVocabulariesOperation.java |  2 +-
 .../get/GetVocabulariesOperationResult.java      |  2 +-
 .../get/GetVocabularyTermsOperation.java         |  3 +--
 .../get/GetVocabularyTermsOperationResult.java   |  3 +--
 .../v3/dto/vocabulary/id/IVocabularyId.java      |  3 +--
 .../v3/dto/vocabulary/id/IVocabularyTermId.java  |  3 +--
 .../v3/dto/vocabulary/id/VocabularyPermId.java   |  3 +--
 .../dto/vocabulary/id/VocabularyTermPermId.java  |  3 +--
 .../search/SearchVocabulariesOperation.java      |  3 +--
 .../SearchVocabulariesOperationResult.java       |  3 +--
 .../search/SearchVocabularyTermsOperation.java   |  3 +--
 .../SearchVocabularyTermsOperationResult.java    |  3 +--
 .../search/VocabularySearchCriteria.java         |  3 +--
 .../search/VocabularyTermSearchCriteria.java     |  3 +--
 .../update/UpdateVocabulariesOperation.java      |  3 +--
 .../UpdateVocabulariesOperationResult.java       |  3 +--
 .../update/UpdateVocabularyTermsOperation.java   |  3 +--
 .../UpdateVocabularyTermsOperationResult.java    |  3 +--
 .../vocabulary/update/VocabularyTermUpdate.java  |  3 +--
 .../dto/vocabulary/update/VocabularyUpdate.java  |  3 +--
 .../asapi/v3/dto/webapp/WebAppSetting.java       |  3 +--
 .../asapi/v3/dto/webapp/WebAppSettings.java      |  3 +--
 .../dto/webapp/create/WebAppSettingCreation.java |  3 +--
 .../fetchoptions/WebAppSettingsFetchOptions.java |  2 +-
 ...ppSettingsFetchOptionsAllSettingsHandler.java |  3 +--
 ...ebAppSettingsFetchOptionsSettingsHandler.java |  3 +--
 .../fetchoptions/WebAppSettingsSortOptions.java  |  3 +--
 .../webapp/update/WebAppSettingsUpdateValue.java |  3 +--
 .../asapi/v3/exceptions/NotFetchedException.java | 15 +++++++++++++++
 .../v3/exceptions/ObjectNotFoundException.java   |  3 +--
 .../UnauthorizedObjectAccessException.java       |  3 +--
 .../exceptions/UnsupportedObjectIdException.java |  3 +--
 .../v3/plugin/listener/IOperationListener.java   | 15 +++++++++++++++
 .../plugin/service/ICustomASServiceExecutor.java |  3 +--
 .../asapi/v3/plugin/service/IImportService.java  |  3 +--
 .../service/context/CustomASServiceContext.java  |  3 +--
 .../plugin/service/context/ServiceContext.java   |  3 +--
 .../generic/dssapi/v3/IDataStoreServerApi.java   |  3 +--
 .../dto/dataset/create/FullDataSetCreation.java  | 15 +++++++++++++++
 .../dataset/create/UploadedDataSetCreation.java  | 15 +++++++++++++++
 .../dssapi/v3/dto/datasetfile/DataSetFile.java   |  3 +--
 .../datasetfile/create/DataSetFileCreation.java  | 15 +++++++++++++++
 .../download/DataSetFileDownload.java            |  3 +--
 .../download/DataSetFileDownloadOptions.java     |  3 +--
 .../download/DataSetFileDownloadReader.java      |  3 +--
 .../fastdownload/FastDownloadMethod.java         |  3 +--
 .../fastdownload/FastDownloadParameter.java      |  3 +--
 .../fastdownload/FastDownloadSession.java        |  3 +--
 .../fastdownload/FastDownloadSessionOptions.java |  3 +--
 .../fetchoptions/DataSetFileFetchOptions.java    |  2 +-
 .../fetchoptions/DataSetFileSortOptions.java     |  3 +--
 .../v3/dto/datasetfile/id/DataSetFilePermId.java |  3 +--
 .../v3/dto/datasetfile/id/IDataSetFileId.java    |  3 +--
 .../search/DataSetFileSearchCriteria.java        |  3 +--
 .../v3/fastdownload/FastDownloadResult.java      |  3 +--
 .../v3/fastdownload/FastDownloadUtils.java       |  3 +--
 .../dssapi/v3/fastdownload/FastDownloader.java   |  3 +--
 .../fastdownload/RemoteFastDownloadServer.java   |  3 +--
 .../v1/IGeneralInformationChangingService.java   |  3 +--
 .../api/v1/IGeneralInformationService.java       |  3 +--
 .../dto/AbstractEntitySearchResultLocation.java  |  3 +--
 .../shared/api/v1/dto/AlignmentMatch.java        |  3 +--
 .../generic/shared/api/v1/dto/Attachment.java    |  3 +--
 .../generic/shared/api/v1/dto/BlastScore.java    |  3 +--
 .../v1/dto/ControlledVocabularyPropertyType.java |  3 +--
 .../generic/shared/api/v1/dto/DataSet.java       |  3 +--
 .../shared/api/v1/dto/DataSetFetchOption.java    |  3 +--
 .../shared/api/v1/dto/DataSetFetchOptions.java   |  3 +--
 .../DataSetFileBlastSearchResultLocation.java    |  3 +--
 .../v1/dto/DataSetFileSearchResultLocation.java  |  3 +--
 .../generic/shared/api/v1/dto/DataSetKind.java   |  3 +--
 .../generic/shared/api/v1/dto/DataSetType.java   |  3 +--
 .../shared/api/v1/dto/DataSetTypeFilter.java     |  3 +--
 .../generic/shared/api/v1/dto/DataStore.java     |  3 +--
 .../api/v1/dto/DataStoreURLForDataSets.java      |  3 +--
 .../generic/shared/api/v1/dto/DeletedEntity.java |  3 +--
 .../generic/shared/api/v1/dto/Deletion.java      |  3 +--
 .../shared/api/v1/dto/DeletionFetchOption.java   |  3 +--
 .../generic/shared/api/v1/dto/DeletionType.java  |  3 +--
 .../generic/shared/api/v1/dto/EntityKind.java    |  3 +--
 .../EntityPropertyBlastSearchResultLocation.java |  3 +--
 .../dto/EntityPropertySearchResultLocation.java  |  3 +--
 .../api/v1/dto/EntityRegistrationDetails.java    |  3 +--
 .../generic/shared/api/v1/dto/EntityType.java    |  3 +--
 .../shared/api/v1/dto/EntityTypeInitializer.java |  3 +--
 .../generic/shared/api/v1/dto/Experiment.java    |  3 +--
 .../shared/api/v1/dto/ExperimentType.java        |  3 +--
 .../api/v1/dto/ISearchDomainResultLocation.java  |  3 +--
 .../api/v1/dto/ISearchDomainResultScore.java     |  3 +--
 .../shared/api/v1/dto/InitializingChecks.java    |  3 +--
 .../generic/shared/api/v1/dto/Material.java      |  3 +--
 .../shared/api/v1/dto/MaterialIdentifier.java    |  3 +--
 .../api/v1/dto/MaterialTypeIdentifier.java       |  3 +--
 .../api/v1/dto/MetaprojectAssignments.java       |  3 +--
 .../api/v1/dto/MetaprojectAssignmentsIds.java    |  3 +--
 .../shared/api/v1/dto/NewVocabularyTerm.java     |  3 +--
 .../generic/shared/api/v1/dto/Project.java       |  3 +--
 .../generic/shared/api/v1/dto/PropertyType.java  |  3 +--
 .../shared/api/v1/dto/PropertyTypeGroup.java     |  3 +--
 .../openbis/generic/shared/api/v1/dto/Role.java  |  3 +--
 .../generic/shared/api/v1/dto/Sample.java        |  3 +--
 .../shared/api/v1/dto/SampleFetchOption.java     |  3 +--
 .../generic/shared/api/v1/dto/SampleType.java    |  3 +--
 .../shared/api/v1/dto/SearchCriteria.java        |  3 +--
 .../generic/shared/api/v1/dto/SearchDomain.java  |  3 +--
 .../api/v1/dto/SearchDomainSearchOption.java     |  3 +--
 .../api/v1/dto/SearchDomainSearchResult.java     |  3 +--
 .../shared/api/v1/dto/SearchSubCriteria.java     | 15 +++++++++++++++
 .../shared/api/v1/dto/SearchableEntityKind.java  | 15 +++++++++++++++
 .../dto/SpaceWithProjectsAndRoleAssignments.java |  3 +--
 .../shared/api/v1/dto/ValidationPluginInfo.java  |  3 +--
 .../generic/shared/api/v1/dto/Vocabulary.java    |  3 +--
 .../shared/api/v1/dto/VocabularyTerm.java        |  3 +--
 .../shared/api/v1/dto/WebAppSettings.java        |  3 +--
 .../generic/shared/api/v1/dto/id/IObjectId.java  |  3 +--
 .../shared/api/v1/dto/id/ObjectIdentifierId.java |  3 +--
 .../shared/api/v1/dto/id/ObjectPermIdId.java     |  3 +--
 .../shared/api/v1/dto/id/ObjectTechIdId.java     |  3 +--
 .../api/v1/dto/id/dataset/DataSetCodeId.java     |  3 +--
 .../api/v1/dto/id/dataset/DataSetTechIdId.java   |  3 +--
 .../shared/api/v1/dto/id/dataset/IDataSetId.java |  3 +--
 .../id/experiment/ExperimentIdentifierId.java    |  3 +--
 .../v1/dto/id/experiment/ExperimentPermIdId.java |  3 +--
 .../v1/dto/id/experiment/ExperimentTechIdId.java |  3 +--
 .../api/v1/dto/id/experiment/IExperimentId.java  |  3 +--
 .../api/v1/dto/id/material/IMaterialId.java      |  3 +--
 .../id/material/MaterialCodeAndTypeCodeId.java   |  3 +--
 .../api/v1/dto/id/material/MaterialTechIdId.java |  3 +--
 .../v1/dto/id/metaproject/IMetaprojectId.java    |  3 +--
 .../id/metaproject/MetaprojectIdentifierId.java  |  3 +--
 .../dto/id/metaproject/MetaprojectTechIdId.java  |  3 +--
 .../shared/api/v1/dto/id/project/IProjectId.java |  3 +--
 .../v1/dto/id/project/ProjectIdentifierId.java   |  3 +--
 .../api/v1/dto/id/project/ProjectPermIdId.java   |  3 +--
 .../api/v1/dto/id/project/ProjectTechIdId.java   |  3 +--
 .../shared/api/v1/dto/id/sample/ISampleId.java   |  3 +--
 .../api/v1/dto/id/sample/SampleIdentifierId.java |  3 +--
 .../api/v1/dto/id/sample/SamplePermIdId.java     |  3 +--
 .../api/v1/dto/id/sample/SampleTechIdId.java     |  3 +--
 .../shared/api/v1/filter/AndDataSetFilter.java   |  3 +--
 .../shared/api/v1/filter/IDataSetFilter.java     |  3 +--
 .../v1/filter/PropertiesBasedDataSetFilter.java  |  3 +--
 .../api/v1/filter/TypeBasedDataSetFilter.java    |  3 +--
 .../shared/api/v1/util/JsonPropertyUtil.java     |  3 +--
 .../generic/shared/basic/ICodeHolder.java        |  3 +--
 .../generic/shared/basic/IIdAndCodeHolder.java   |  3 +--
 .../openbis/generic/shared/basic/IIdHolder.java  |  3 +--
 .../generic/shared/basic/IIdentifierHolder.java  |  3 +--
 .../basic/IRegistratorAndModifierHolder.java     |  3 +--
 .../generic/shared/basic/IRegistratorHolder.java |  3 +--
 .../openbis/generic/shared/basic/TechId.java     |  3 +--
 .../basic/dto/AbstractRegistrationHolder.java    |  3 +--
 .../openbis/generic/shared/basic/dto/Code.java   |  3 +--
 .../shared/basic/dto/CodeWithRegistration.java   |  3 +--
 .../CodeWithRegistrationAndModificationDate.java |  3 +--
 .../generic/shared/basic/dto/DataTypeCode.java   |  3 +--
 .../shared/basic/dto/DatabaseInstance.java       |  3 +--
 .../generic/shared/basic/dto/EntityKind.java     |  3 +--
 .../basic/dto/ExternalDataManagementSystem.java  | 15 +++++++++++++++
 .../dto/ExternalDataManagementSystemType.java    | 15 +++++++++++++++
 .../generic/shared/basic/dto/FetchOption.java    |  3 +--
 .../generic/shared/basic/dto/FetchOptions.java   |  3 +--
 .../basic/dto/IMetaprojectRegistration.java      |  3 +--
 .../shared/basic/dto/IMetaprojectUpdates.java    |  3 +--
 .../shared/basic/dto/IVocabularyTermUpdates.java |  3 +--
 .../shared/basic/dto/IVocabularyUpdates.java     |  3 +--
 .../generic/shared/basic/dto/Metaproject.java    |  3 +--
 .../shared/basic/dto/MetaprojectIdentifier.java  |  3 +--
 .../basic/dto/MetaprojectNullRegistration.java   |  3 +--
 .../shared/basic/dto/MetaprojectNullUpdates.java |  3 +--
 .../openbis/generic/shared/basic/dto/Person.java |  3 +--
 .../shared/basic/dto/ServiceVersionHolder.java   |  3 +--
 .../generic/shared/basic/dto/Vocabulary.java     |  3 +--
 .../generic/shared/basic/dto/VocabularyTerm.java |  3 +--
 .../shared/basic/util/JsonPropertyUtil.java      |  3 +--
 .../fetchoptions/ExperimentFetchOptionsTest.java |  3 +--
 .../UnauthorizedObjectAccessExceptionTest.java   |  3 +--
 .../generic/sharedapi/v3/ApiClassesProvider.java |  3 +--
 .../generic/sharedapi/v3/EnglishCheck.java       |  3 +--
 .../generic/sharedapi/v3/EnglishDictionary.java  |  3 +--
 .../generic/sharedapi/v3/ToStringCheck.java      |  3 +--
 .../cisd/openbis/DependencyCheckingTest.java     |  3 +--
 .../v1/filter/TypeBasedDataSetFilterTest.java    |  3 +--
 1108 files changed, 1697 insertions(+), 2049 deletions(-)

diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/OpenBIS.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/OpenBIS.java
index 57162956ce1..c8ff840f216 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/OpenBIS.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/OpenBIS.java
@@ -1,3 +1,19 @@
+/*
+ *  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;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.IApplicationServerApi;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/OpenBISAPI.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/OpenBISAPI.java
index ad3536e7265..8cd4fc81ee6 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/OpenBISAPI.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/OpenBISAPI.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;
 
 import java.io.File;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/IApplicationServerApi.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/IApplicationServerApi.java
index 33c1f60e8fe..adbc705142b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/IApplicationServerApi.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/IApplicationServerApi.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.asapi.v3;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.authorizationgroup.AuthorizationGroup;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/Attachment.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/Attachment.java
index 478ed7058f6..518e49dcdc9 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/Attachment.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/Attachment.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/create/AttachmentCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/create/AttachmentCreation.java
index efb60e40e23..6bdd257129b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/create/AttachmentCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/create/AttachmentCreation.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.asapi.v3.dto.attachment.create;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/fetchoptions/AttachmentFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/fetchoptions/AttachmentFetchOptions.java
index 8fca78a3261..19a75c224fd 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/fetchoptions/AttachmentFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/fetchoptions/AttachmentFetchOptions.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/fetchoptions/AttachmentSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/fetchoptions/AttachmentSortOptions.java
index 7f34fc834ba..922c65c830e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/fetchoptions/AttachmentSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/fetchoptions/AttachmentSortOptions.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.asapi.v3.dto.attachment.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.attachment.Attachment;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/id/AttachmentFileName.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/id/AttachmentFileName.java
index 297e6e9d7f3..c1e6569358f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/id/AttachmentFileName.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/id/AttachmentFileName.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.ethz.sis.openbis.generic.asapi.v3.dto.attachment.id;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/id/IAttachmentId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/id/IAttachmentId.java
index 538d9fb75e2..2042479796f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/id/IAttachmentId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/id/IAttachmentId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.attachment.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/update/AttachmentListUpdateValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/update/AttachmentListUpdateValue.java
index 8444ed3b3bc..23b1d950969 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/update/AttachmentListUpdateValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/attachment/update/AttachmentListUpdateValue.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.asapi.v3.dto.attachment.update;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.attachment.create.AttachmentCreation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/AuthorizationGroup.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/AuthorizationGroup.java
index cfcbd12e5aa..0946fad352f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/AuthorizationGroup.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/AuthorizationGroup.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.asapi.v3.dto.authorizationgroup;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/create/AuthorizationGroupCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/create/AuthorizationGroupCreation.java
index 470182ca7d8..5e03da4349c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/create/AuthorizationGroupCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/create/AuthorizationGroupCreation.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.asapi.v3.dto.authorizationgroup.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/create/CreateAuthorizationGroupsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/create/CreateAuthorizationGroupsOperation.java
index 389c3983c41..a29791e8d7f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/create/CreateAuthorizationGroupsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/create/CreateAuthorizationGroupsOperation.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.asapi.v3.dto.authorizationgroup.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/create/CreateAuthorizationGroupsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/create/CreateAuthorizationGroupsOperationResult.java
index bd08f6a7623..74fd8ee005f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/create/CreateAuthorizationGroupsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/create/CreateAuthorizationGroupsOperationResult.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.asapi.v3.dto.authorizationgroup.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/delete/AuthorizationGroupDeletionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/delete/AuthorizationGroupDeletionOptions.java
index 966d82aea4e..eee2975bd01 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/delete/AuthorizationGroupDeletionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/delete/AuthorizationGroupDeletionOptions.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.asapi.v3.dto.authorizationgroup.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.AbstractObjectDeletionOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/delete/DeleteAuthorizationGroupsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/delete/DeleteAuthorizationGroupsOperation.java
index 27b179d5550..622dcd2c9a4 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/delete/DeleteAuthorizationGroupsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/delete/DeleteAuthorizationGroupsOperation.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.asapi.v3.dto.authorizationgroup.delete;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/delete/DeleteAuthorizationGroupsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/delete/DeleteAuthorizationGroupsOperationResult.java
index c4c6224e3fa..67cb98d5460 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/delete/DeleteAuthorizationGroupsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/delete/DeleteAuthorizationGroupsOperationResult.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.asapi.v3.dto.authorizationgroup.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.delete.DeleteObjectsWithoutTrashOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/fetchoptions/AuthorizationGroupFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/fetchoptions/AuthorizationGroupFetchOptions.java
index a999a16610c..bbde3759a2d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/fetchoptions/AuthorizationGroupFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/fetchoptions/AuthorizationGroupFetchOptions.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.asapi.v3.dto.authorizationgroup.fetchoptions;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/fetchoptions/AuthorizationGroupSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/fetchoptions/AuthorizationGroupSortOptions.java
index 43c6c4dfd40..0785aa427c9 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/fetchoptions/AuthorizationGroupSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/fetchoptions/AuthorizationGroupSortOptions.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.asapi.v3.dto.authorizationgroup.fetchoptions;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/get/GetAuthorizationGroupsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/get/GetAuthorizationGroupsOperation.java
index 9b13ec2bb28..0d07e4411e4 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/get/GetAuthorizationGroupsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/get/GetAuthorizationGroupsOperation.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.asapi.v3.dto.authorizationgroup.get;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/get/GetAuthorizationGroupsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/get/GetAuthorizationGroupsOperationResult.java
index 669f87f1cfc..aeb65d3d6da 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/get/GetAuthorizationGroupsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/get/GetAuthorizationGroupsOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.authorizationgroup.get;
 
 import java.util.Map;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/id/AuthorizationGroupPermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/id/AuthorizationGroupPermId.java
index f9283bf203b..70a66707f86 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/id/AuthorizationGroupPermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/id/AuthorizationGroupPermId.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.asapi.v3.dto.authorizationgroup.id;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/id/IAuthorizationGroupId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/id/IAuthorizationGroupId.java
index da8706fceb4..931c3e28cb0 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/id/IAuthorizationGroupId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/id/IAuthorizationGroupId.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.asapi.v3.dto.authorizationgroup.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/search/AuthorizationGroupSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/search/AuthorizationGroupSearchCriteria.java
index 4f13b69d851..b9cbe317384 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/search/AuthorizationGroupSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/search/AuthorizationGroupSearchCriteria.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.asapi.v3.dto.authorizationgroup.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.authorizationgroup.id.IAuthorizationGroupId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/search/SearchAuthorizationGroupsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/search/SearchAuthorizationGroupsOperation.java
index 18496402542..1d771599062 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/search/SearchAuthorizationGroupsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/search/SearchAuthorizationGroupsOperation.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.asapi.v3.dto.authorizationgroup.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.authorizationgroup.fetchoptions.AuthorizationGroupFetchOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/search/SearchAuthorizationGroupsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/search/SearchAuthorizationGroupsOperationResult.java
index 7949ad7fbae..48c985f5f9d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/search/SearchAuthorizationGroupsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/search/SearchAuthorizationGroupsOperationResult.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.asapi.v3.dto.authorizationgroup.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.authorizationgroup.AuthorizationGroup;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/update/AuthorizationGroupUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/update/AuthorizationGroupUpdate.java
index ee3c5ee8588..499ad4baa4c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/update/AuthorizationGroupUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/update/AuthorizationGroupUpdate.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.asapi.v3.dto.authorizationgroup.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/update/UpdateAuthorizationGroupsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/update/UpdateAuthorizationGroupsOperation.java
index 58a0bb919bf..40b07236456 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/update/UpdateAuthorizationGroupsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/update/UpdateAuthorizationGroupsOperation.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.asapi.v3.dto.authorizationgroup.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/update/UpdateAuthorizationGroupsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/update/UpdateAuthorizationGroupsOperationResult.java
index 72fed4dae30..198d3a7c875 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/update/UpdateAuthorizationGroupsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/authorizationgroup/update/UpdateAuthorizationGroupsOperationResult.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.asapi.v3.dto.authorizationgroup.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/ITableCell.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/ITableCell.java
index debc7cdc037..c1291ea920c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/ITableCell.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/ITableCell.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.asapi.v3.dto.common;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/ObjectToString.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/ObjectToString.java
index 952ba771c01..6d5c578313d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/ObjectToString.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/ObjectToString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/Relationship.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/Relationship.java
index 23666c77e49..e0d680d85b3 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/Relationship.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/Relationship.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.asapi.v3.dto.common;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/TableColumn.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/TableColumn.java
index a2abbb7b23d..0cb1a891603 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/TableColumn.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/TableColumn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/TableDoubleCell.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/TableDoubleCell.java
index 605b127c491..b993b48f051 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/TableDoubleCell.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/TableDoubleCell.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/TableLongCell.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/TableLongCell.java
index 9a12849ce83..146e30110cc 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/TableLongCell.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/TableLongCell.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/TableModel.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/TableModel.java
index 0c8f6ffc391..9e48c7a557f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/TableModel.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/TableModel.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.asapi.v3.dto.common;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/TableStringCell.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/TableStringCell.java
index 7454b0b00cb..00f75c3efe2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/TableStringCell.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/TableStringCell.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/create/CreateObjectsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/create/CreateObjectsOperation.java
index 3b82d3b00ee..501a5cda445 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/create/CreateObjectsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/create/CreateObjectsOperation.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.asapi.v3.dto.common.create;
 
 import java.util.Arrays;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/create/CreateObjectsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/create/CreateObjectsOperationResult.java
index 1b352813c1d..57f3faa622e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/create/CreateObjectsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/create/CreateObjectsOperationResult.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.asapi.v3.dto.common.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/create/ICreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/create/ICreation.java
index 7b2324351b4..9c0af4a05e0 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/create/ICreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/create/ICreation.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.asapi.v3.dto.common.create;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/create/IObjectCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/create/IObjectCreation.java
index 5f015ef8a8f..320f808c07c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/create/IObjectCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/create/IObjectCreation.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.asapi.v3.dto.common.create;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/delete/DeleteObjectsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/delete/DeleteObjectsOperation.java
index ccfd9beb2ee..b3ae5869500 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/delete/DeleteObjectsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/delete/DeleteObjectsOperation.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.asapi.v3.dto.common.delete;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/delete/DeleteObjectsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/delete/DeleteObjectsOperationResult.java
index 54e8ccdf3ee..f5baeeb034a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/delete/DeleteObjectsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/delete/DeleteObjectsOperationResult.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.asapi.v3.dto.common.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/delete/DeleteObjectsWithTrashOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/delete/DeleteObjectsWithTrashOperationResult.java
index 3f2f7df81b0..0ca0f26f9f0 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/delete/DeleteObjectsWithTrashOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/delete/DeleteObjectsWithTrashOperationResult.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.asapi.v3.dto.common.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.id.IDeletionId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/delete/DeleteObjectsWithoutTrashOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/delete/DeleteObjectsWithoutTrashOperationResult.java
index 10443d7b97c..ff0a8bcf66c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/delete/DeleteObjectsWithoutTrashOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/delete/DeleteObjectsWithoutTrashOperationResult.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.asapi.v3.dto.common.delete;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/CacheMode.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/CacheMode.java
index 3ef6f5277e0..d1b3063e663 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/CacheMode.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/CacheMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/EmptyFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/EmptyFetchOptions.java
index f760e3eca1a..dd2d6c28504 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/EmptyFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/EmptyFetchOptions.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.asapi.v3.dto.common.fetchoptions;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/EntitySortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/EntitySortOptions.java
index f7d50ec2d97..6968b00e744 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/EntitySortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/EntitySortOptions.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.asapi.v3.dto.common.fetchoptions;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/EntityWithPropertiesSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/EntityWithPropertiesSortOptions.java
index 601aab2e6a3..cd8e6e0c84e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/EntityWithPropertiesSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/EntityWithPropertiesSortOptions.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.asapi.v3.dto.common.fetchoptions;
 
 import static ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortParameter.MATCH_VALUE;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/FetchIgnore.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/FetchIgnore.java
index 4133d23f07a..d027adfed4f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/FetchIgnore.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/FetchIgnore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 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.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions;
 
 import java.lang.annotation.ElementType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/FetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/FetchOptions.java
index 370d10a18fd..a787957b096 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/FetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/FetchOptions.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.asapi.v3.dto.common.fetchoptions;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/FetchOptionsToStringBuilder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/FetchOptionsToStringBuilder.java
index 9079470e5b5..abfc41da256 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/FetchOptionsToStringBuilder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/FetchOptionsToStringBuilder.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.asapi.v3.dto.common.fetchoptions;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/FetchProperty.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/FetchProperty.java
index 23edf101303..27824ae5d7b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/FetchProperty.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/FetchProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 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.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions;
 
 import java.lang.annotation.ElementType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/IFetchOptionsMatcher.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/IFetchOptionsMatcher.java
index 5c76b26d8c5..054b7d8c496 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/IFetchOptionsMatcher.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/IFetchOptionsMatcher.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.asapi.v3.dto.common.fetchoptions;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/IFetchPropertyHandler.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/IFetchPropertyHandler.java
index 2b5d25b94c0..3a721f313e0 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/IFetchPropertyHandler.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/IFetchPropertyHandler.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.asapi.v3.dto.common.fetchoptions;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/SortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/SortOptions.java
index 6971b510617..92839770323 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/SortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/SortOptions.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.asapi.v3.dto.common.fetchoptions;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/SortOrder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/SortOrder.java
index 7731cf42914..ee917371303 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/SortOrder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/SortOrder.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.asapi.v3.dto.common.fetchoptions;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/SortParameter.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/SortParameter.java
index 44cca916f25..6a0641815ae 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/SortParameter.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/SortParameter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/Sorting.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/Sorting.java
index 11b10ccff58..856ed9463a9 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/Sorting.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/Sorting.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.asapi.v3.dto.common.fetchoptions;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/view/AbstractCollectionView.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/view/AbstractCollectionView.java
index ac6da7970fe..3b160164ae1 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/view/AbstractCollectionView.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/view/AbstractCollectionView.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.asapi.v3.dto.common.fetchoptions.view;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/view/ListView.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/view/ListView.java
index bdb0889dd9b..7c27d69c85a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/view/ListView.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/view/ListView.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.asapi.v3.dto.common.fetchoptions.view;
 
 import java.util.ArrayList;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/view/SetView.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/view/SetView.java
index 54f1c2f7cf9..3132ddc94a7 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/view/SetView.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/fetchoptions/view/SetView.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.asapi.v3.dto.common.fetchoptions.view;
 
 import java.util.Collection;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/get/GetObjectsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/get/GetObjectsOperation.java
index c6976c882a4..d2a0efff14e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/get/GetObjectsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/get/GetObjectsOperation.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.asapi.v3.dto.common.get;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/get/GetServerInformationOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/get/GetServerInformationOperationResult.java
index db2809bbc67..d2881118827 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/get/GetServerInformationOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/get/GetServerInformationOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.get;
 
 import java.util.Map;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/get/GetServerPublicInformationOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/get/GetServerPublicInformationOperation.java
index ca2522d937e..c4331a57adf 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/get/GetServerPublicInformationOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/get/GetServerPublicInformationOperation.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.asapi.v3.dto.common.get;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/get/GetServerPublicInformationOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/get/GetServerPublicInformationOperationResult.java
index a2374b1b5f3..e19a9488ecb 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/get/GetServerPublicInformationOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/get/GetServerPublicInformationOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.get;
 
 import java.util.Map;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/CreationId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/CreationId.java
index f4d2ff85059..5624ffbe0e1 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/CreationId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/CreationId.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/IObjectId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/IObjectId.java
index 9c759cd773a..c700efb089d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/IObjectId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/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.ethz.sis.openbis.generic.asapi.v3.dto.common.id;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/ObjectIdentifier.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/ObjectIdentifier.java
index a913b6b1043..88da68c2f30 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/ObjectIdentifier.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/ObjectIdentifier.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.asapi.v3.dto.common.id;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/ObjectPermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/ObjectPermId.java
index 41280e32991..0416a8d4bf4 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/ObjectPermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/ObjectPermId.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.asapi.v3.dto.common.id;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/ObjectTechId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/ObjectTechId.java
index b6b3a424435..f398fa816c9 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/ObjectTechId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/id/ObjectTechId.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.asapi.v3.dto.common.id;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IAttachmentsHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IAttachmentsHolder.java
index 2c7f2180425..66fd229e4b8 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IAttachmentsHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IAttachmentsHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ICodeHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ICodeHolder.java
index bded05b19be..1f9f5183997 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ICodeHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ICodeHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ICreationIdHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ICreationIdHolder.java
index 74948f0d844..ffa0f6afabc 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ICreationIdHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ICreationIdHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.CreationId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IDataSetCodesHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IDataSetCodesHolder.java
index 4e4656fff03..a7541181611 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IDataSetCodesHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IDataSetCodesHolder.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.asapi.v3.dto.common.interfaces;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IDataSetsHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IDataSetsHolder.java
index 128abc7fd57..ecbc80b1cef 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IDataSetsHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IDataSetsHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IDescriptionHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IDescriptionHolder.java
index bdd5fc3ae59..a363e118099 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IDescriptionHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IDescriptionHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IEntityType.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IEntityType.java
index a65a03ef874..e39b8fc1a23 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IEntityType.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IEntityType.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.asapi.v3.dto.common.interfaces;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IEntityTypeHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IEntityTypeHolder.java
index 34c4863f96a..a95b136bf52 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IEntityTypeHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IEntityTypeHolder.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.asapi.v3.dto.common.interfaces;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IExperimentHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IExperimentHolder.java
index d0fa401d8aa..092e1cbf8bc 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IExperimentHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IExperimentHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.Experiment;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IExperimentsHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IExperimentsHolder.java
index c15f23fbc1c..cff253dceb5 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IExperimentsHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IExperimentsHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IIdentifierHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IIdentifierHolder.java
index 9238d84413a..af5d6552583 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IIdentifierHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IIdentifierHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectIdentifier;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ILabelHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ILabelHolder.java
index 5c081bd2705..523bd4cc775 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ILabelHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ILabelHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IMaterialPropertiesHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IMaterialPropertiesHolder.java
index 53213b834f3..f7d13a686cd 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IMaterialPropertiesHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IMaterialPropertiesHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces;
 
 import java.util.Map;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IMaterialsHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IMaterialsHolder.java
index 72133aa441a..d1b6e8b987d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IMaterialsHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IMaterialsHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IModificationDateHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IModificationDateHolder.java
index 525bbb9d62f..9904b3ea4e2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IModificationDateHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IModificationDateHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces;
 
 import java.util.Date;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IModifierHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IModifierHolder.java
index 99e04401f04..a4752f4304e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IModifierHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IModifierHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.Person;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/INameHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/INameHolder.java
index 02097f78785..beb0ed1b73e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/INameHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/INameHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IOwnerHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IOwnerHolder.java
index 6d7b2cba3c4..a760fc24d2e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IOwnerHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IOwnerHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.Person;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IParentChildrenHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IParentChildrenHolder.java
index 291e37e79e0..6460360a159 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IParentChildrenHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IParentChildrenHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IPermIdHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IPermIdHolder.java
index 4a0fd493eb9..2cb01f7c18b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IPermIdHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IPermIdHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IProjectHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IProjectHolder.java
index f16fc5034e9..2055b526d1b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IProjectHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IProjectHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.project.Project;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IProjectsHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IProjectsHolder.java
index 5103fafa1c8..bafa73a4749 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IProjectsHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IProjectsHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IPropertiesHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IPropertiesHolder.java
index 05920c191d9..912e98f6192 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IPropertiesHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IPropertiesHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces;
 
 import java.util.Map;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IPropertyAssignmentsHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IPropertyAssignmentsHolder.java
index a524b73c580..0ce73b1dae2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IPropertyAssignmentsHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IPropertyAssignmentsHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IPropertyTypeHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IPropertyTypeHolder.java
index dce18bd8afa..ea1ded0daa3 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IPropertyTypeHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IPropertyTypeHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.property.PropertyType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IRegistrationDateHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IRegistrationDateHolder.java
index 9a96575e9e5..f7e9183be2c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IRegistrationDateHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IRegistrationDateHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces;
 
 import java.util.Date;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IRegistratorHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IRegistratorHolder.java
index 8cdfc41c90f..0375eb687ea 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IRegistratorHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IRegistratorHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.person.Person;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ISampleHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ISampleHolder.java
index de954bb3894..54434f3f2a8 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ISampleHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ISampleHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.Sample;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ISamplesHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ISamplesHolder.java
index 1ac7569e5da..97da8996bfa 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ISamplesHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ISamplesHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ISemanticAnnotationsHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ISemanticAnnotationsHolder.java
index 16e9c7c6d8b..c7ae2d0fac4 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ISemanticAnnotationsHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ISemanticAnnotationsHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ISpaceHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ISpaceHolder.java
index 4632fe3f310..f5c9f888c1b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ISpaceHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ISpaceHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.Space;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ITagsHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ITagsHolder.java
index 6d2ff71436b..8553f092dd6 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ITagsHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/ITagsHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces;
 
 import java.util.Set;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IValidationPluginHolder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IValidationPluginHolder.java
index e66e5fc75af..809503312b4 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IValidationPluginHolder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/interfaces/IValidationPluginHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.interfaces;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.plugin.Plugin;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/operation/IOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/operation/IOperation.java
index 3ccdb83ed50..5ff5cd07e2b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/operation/IOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/operation/IOperation.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.asapi.v3.dto.common.operation;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/operation/IOperationExecutionError.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/operation/IOperationExecutionError.java
index c58a8500660..e77303ba37e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/operation/IOperationExecutionError.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/operation/IOperationExecutionError.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.asapi.v3.dto.common.operation;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/operation/IOperationExecutionProgress.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/operation/IOperationExecutionProgress.java
index 728d2569dcf..87c4cd11fdd 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/operation/IOperationExecutionProgress.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/operation/IOperationExecutionProgress.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.asapi.v3.dto.common.operation;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/operation/IOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/operation/IOperationResult.java
index bccfedbb19d..3b671ba2b73 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/operation/IOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/operation/IOperationResult.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.asapi.v3.dto.common.operation;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractCompositeSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractCompositeSearchCriteria.java
index 3059285b0c6..8d46d1278c9 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractCompositeSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractCompositeSearchCriteria.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.asapi.v3.dto.common.search;
 
 import java.util.Collection;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractDateObjectValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractDateObjectValue.java
index 1a6991543b1..529782ede01 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractDateObjectValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractDateObjectValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search;
 
 import java.util.Date;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractDateValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractDateValue.java
index 7d879553f7f..677d2edec46 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractDateValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractDateValue.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractEntitySearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractEntitySearchCriteria.java
index abfea0bf12d..69ab824d65b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractEntitySearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractEntitySearchCriteria.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.asapi.v3.dto.common.search;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractFieldSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractFieldSearchCriteria.java
index c6e2aa09a51..f476675f9b0 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractFieldSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractFieldSearchCriteria.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractNumberValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractNumberValue.java
index 015d116da1d..c6d9000688a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractNumberValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractNumberValue.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractObjectSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractObjectSearchCriteria.java
index 1f886412804..773d9f28e18 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractObjectSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractObjectSearchCriteria.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.asapi.v3.dto.common.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractSearchCriteria.java
index 09e46214b6a..8c199a53a87 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractSearchCriteria.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractStringValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractStringValue.java
index 874cff949c6..1085cc9c697 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractStringValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractStringValue.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractValue.java
index c314f82c5f0..7b35f0a88d2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AbstractValue.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.asapi.v3.dto.common.search;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyBooleanPropertySearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyBooleanPropertySearchCriteria.java
index 1c9955c87c4..13ddceffe83 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyBooleanPropertySearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyBooleanPropertySearchCriteria.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyDatePropertySearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyDatePropertySearchCriteria.java
index b8584a3bdd3..3a3b2e71827 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyDatePropertySearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyDatePropertySearchCriteria.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyFieldSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyFieldSearchCriteria.java
index aceec09f2b3..56aaa26f987 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyFieldSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyFieldSearchCriteria.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyNumberPropertySearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyNumberPropertySearchCriteria.java
index 1686e13e039..62db7adbdab 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyNumberPropertySearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyNumberPropertySearchCriteria.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyPropertySearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyPropertySearchCriteria.java
index 532761c198e..118bd0cb7da 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyPropertySearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyPropertySearchCriteria.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyStringPropertySearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyStringPropertySearchCriteria.java
index 462070a2870..1ec9f462208 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyStringPropertySearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyStringPropertySearchCriteria.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyStringValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyStringValue.java
index 38ffe4ba6e1..36349ccdcb2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyStringValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/AnyStringValue.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/BooleanFieldSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/BooleanFieldSearchCriteria.java
index d604f204b37..bbc6af1d6a3 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/BooleanFieldSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/BooleanFieldSearchCriteria.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/BooleanPropertySearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/BooleanPropertySearchCriteria.java
index 10e1203223e..82e16cbe4cb 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/BooleanPropertySearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/BooleanPropertySearchCriteria.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/CodeSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/CodeSearchCriteria.java
index 0b3bfa130a3..7e1462b7841 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/CodeSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/CodeSearchCriteria.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/CodesSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/CodesSearchCriteria.java
index 5054a6b0353..b29f9496063 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/CodesSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/CodesSearchCriteria.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/CollectionFieldSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/CollectionFieldSearchCriteria.java
index c2829a4db4d..03f5a7fd04e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/CollectionFieldSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/CollectionFieldSearchCriteria.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.asapi.v3.dto.common.search;
 
 import java.util.Collection;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ControlledVocabularyPropertySearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ControlledVocabularyPropertySearchCriteria.java
index 1280c972b79..da0fd9f3eae 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ControlledVocabularyPropertySearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ControlledVocabularyPropertySearchCriteria.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateEarlierThanOrEqualToValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateEarlierThanOrEqualToValue.java
index 7a137405104..5245cea17a0 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateEarlierThanOrEqualToValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateEarlierThanOrEqualToValue.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateEarlierThanValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateEarlierThanValue.java
index cd9f11398c0..2626020e6df 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateEarlierThanValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateEarlierThanValue.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateEqualToValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateEqualToValue.java
index fdf3150421c..2d880d802ce 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateEqualToValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateEqualToValue.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateFieldSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateFieldSearchCriteria.java
index 5ce31ed6ff5..b1b57d0fb93 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateFieldSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateFieldSearchCriteria.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.asapi.v3.dto.common.search;
 
 import java.text.ParseException;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateLaterThanOrEqualToValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateLaterThanOrEqualToValue.java
index 0cb24a4caf7..7d4a74acc8a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateLaterThanOrEqualToValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateLaterThanOrEqualToValue.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateLaterThanValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateLaterThanValue.java
index 7d91cf63496..37ff42842f0 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateLaterThanValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateLaterThanValue.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectEarlierThanOrEqualToValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectEarlierThanOrEqualToValue.java
index afeb84cf618..2ae723ddbcf 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectEarlierThanOrEqualToValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectEarlierThanOrEqualToValue.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.asapi.v3.dto.common.search;
 
 import java.util.Date;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectEarlierThanValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectEarlierThanValue.java
index a9472f41f34..f646c7b4581 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectEarlierThanValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectEarlierThanValue.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectEqualToValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectEqualToValue.java
index b284dd9a9cd..7c8a97b7f32 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectEqualToValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectEqualToValue.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.asapi.v3.dto.common.search;
 
 import java.util.Date;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectLaterThanValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectLaterThanValue.java
index dea414c3844..ebbb7252710 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectLaterThanValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DateObjectLaterThanValue.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DatePropertySearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DatePropertySearchCriteria.java
index e1ab19d3abe..4efdaa42fbf 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DatePropertySearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DatePropertySearchCriteria.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DescriptionSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DescriptionSearchCriteria.java
index aff4224522e..6870eaa7480 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DescriptionSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/DescriptionSearchCriteria.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/EnumFieldSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/EnumFieldSearchCriteria.java
index 625caa96ed8..08b92d96242 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/EnumFieldSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/EnumFieldSearchCriteria.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IDate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IDate.java
index a253191dbe7..4e1325bf2e9 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IDate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IDate.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.asapi.v3.dto.common.search;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IDateFormat.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IDateFormat.java
index 9d4beb35a4e..e0c9efca767 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IDateFormat.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IDateFormat.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.asapi.v3.dto.common.search;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ISearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ISearchCriteria.java
index 36fd74cdc03..f1bedc1de00 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ISearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ISearchCriteria.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.asapi.v3.dto.common.search;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ITimeZone.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ITimeZone.java
index 3dfce484740..0f645dfb407 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ITimeZone.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ITimeZone.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.asapi.v3.dto.common.search;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IdSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IdSearchCriteria.java
index da477e2fe26..aff08f4a981 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IdSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IdSearchCriteria.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.asapi.v3.dto.common.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IdentifierSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IdentifierSearchCriteria.java
index ac1623b2414..2e8daa77552 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IdentifierSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IdentifierSearchCriteria.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IdsSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IdsSearchCriteria.java
index ac9c7d7f80c..443afb09f67 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IdsSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/IdsSearchCriteria.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.asapi.v3.dto.common.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/LongDateFormat.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/LongDateFormat.java
index c9e38a732d1..4b28e464aa3 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/LongDateFormat.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/LongDateFormat.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ModificationDateSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ModificationDateSearchCriteria.java
index 425a3cf6d75..9e71b925912 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ModificationDateSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ModificationDateSearchCriteria.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NameSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NameSearchCriteria.java
index 8a022e7e31e..68036129b7b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NameSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NameSearchCriteria.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NormalDateFormat.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NormalDateFormat.java
index e21ac97ffaf..0a22a52de1f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NormalDateFormat.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NormalDateFormat.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberEqualToValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberEqualToValue.java
index a654038bc16..e593d627959 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberEqualToValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberEqualToValue.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberFieldSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberFieldSearchCriteria.java
index 94916b24220..f45bf7c0420 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberFieldSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberFieldSearchCriteria.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberGreaterThanOrEqualToValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberGreaterThanOrEqualToValue.java
index e13e52da100..3550a5b0c4f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberGreaterThanOrEqualToValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberGreaterThanOrEqualToValue.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberGreaterThanValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberGreaterThanValue.java
index 96e9124eb43..a9de5f919e5 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberGreaterThanValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberGreaterThanValue.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberLessThanOrEqualToValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberLessThanOrEqualToValue.java
index 20be70a076a..afc449505ee 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberLessThanOrEqualToValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberLessThanOrEqualToValue.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberLessThanValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberLessThanValue.java
index f1a8888bb62..f79cdca7593 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberLessThanValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberLessThanValue.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberPropertySearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberPropertySearchCriteria.java
index 7e1ea892539..2adbf0af994 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberPropertySearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/NumberPropertySearchCriteria.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/PermIdSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/PermIdSearchCriteria.java
index 55944c3d64b..413d13c0fe9 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/PermIdSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/PermIdSearchCriteria.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/RegistrationDateSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/RegistrationDateSearchCriteria.java
index 6082f9783d2..9ad37026c75 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/RegistrationDateSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/RegistrationDateSearchCriteria.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SamplePropertySearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SamplePropertySearchCriteria.java
index 2bd276b645f..9bae0f76227 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SamplePropertySearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SamplePropertySearchCriteria.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchCriteriaToStringBuilder.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchCriteriaToStringBuilder.java
index 88646ca0ae1..28a6010d606 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchCriteriaToStringBuilder.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchCriteriaToStringBuilder.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.asapi.v3.dto.common.search;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchFieldType.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchFieldType.java
index 47f6fcbf2ce..3bd5fed216a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchFieldType.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchFieldType.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchObjectsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchObjectsOperation.java
index 573d4b21f2a..ab4cd0a076f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchObjectsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchObjectsOperation.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.asapi.v3.dto.common.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchObjectsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchObjectsOperationResult.java
index 678073442ee..3a764a09abf 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchObjectsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchObjectsOperationResult.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.asapi.v3.dto.common.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchOperator.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchOperator.java
index 149881a8679..22bbd523ee8 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchOperator.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchOperator.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchResult.java
index 9bf8ca975fe..aef493ab395 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/SearchResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ServerTimeZone.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ServerTimeZone.java
index c7ba105eb80..25e443031f7 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ServerTimeZone.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ServerTimeZone.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.asapi.v3.dto.common.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ShortDateFormat.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ShortDateFormat.java
index c33f0c8f749..226f08c7b48 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ShortDateFormat.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/ShortDateFormat.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StrictlyStringPropertySearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StrictlyStringPropertySearchCriteria.java
index 420d8684ead..7080ab4dac8 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StrictlyStringPropertySearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StrictlyStringPropertySearchCriteria.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringContainsExactlyValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringContainsExactlyValue.java
index 3e2d751ebd4..68b6f119bfb 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringContainsExactlyValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringContainsExactlyValue.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringContainsValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringContainsValue.java
index 71c867c80b1..f9ef1c2a9ac 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringContainsValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringContainsValue.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringEndsWithValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringEndsWithValue.java
index 35448cf7011..7cec69202a2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringEndsWithValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringEndsWithValue.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringEqualToValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringEqualToValue.java
index 16fad9285aa..1d4c9909a1c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringEqualToValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringEqualToValue.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringFieldSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringFieldSearchCriteria.java
index 7de416aee8f..6874faa713f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringFieldSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringFieldSearchCriteria.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringGreaterThanOrEqualToValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringGreaterThanOrEqualToValue.java
index 642cbe5b603..fa944573ef9 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringGreaterThanOrEqualToValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringGreaterThanOrEqualToValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringGreaterThanValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringGreaterThanValue.java
index 11f8fb76b72..ea1a6d4949d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringGreaterThanValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringGreaterThanValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringLessThanOrEqualToValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringLessThanOrEqualToValue.java
index 41048ca90c8..146fade93c6 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringLessThanOrEqualToValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringLessThanOrEqualToValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringLessThanValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringLessThanValue.java
index 3d4949b661d..9c63ce233da 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringLessThanValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringLessThanValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringMatchesValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringMatchesValue.java
index 459f41aafef..2e1e398fb2b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringMatchesValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringMatchesValue.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringPropertySearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringPropertySearchCriteria.java
index c75216a9809..97ab215981a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringPropertySearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringPropertySearchCriteria.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringStartsWithValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringStartsWithValue.java
index 2b6ac44cf4f..d864da6eea8 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringStartsWithValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/StringStartsWithValue.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/TechIdSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/TechIdSearchCriteria.java
index a5943df4530..632bea0cd6f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/TechIdSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/TechIdSearchCriteria.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/TextAttributeSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/TextAttributeSearchCriteria.java
index 4ead0549663..f0d2ae8ceb4 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/TextAttributeSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/TextAttributeSearchCriteria.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.asapi.v3.dto.common.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/TimeZone.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/TimeZone.java
index 26c3571b502..5acd14697f7 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/TimeZone.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/search/TimeZone.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.asapi.v3.dto.common.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/FieldUpdateValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/FieldUpdateValue.java
index 2519485f8f1..b9a644a91bd 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/FieldUpdateValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/FieldUpdateValue.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.asapi.v3.dto.common.update;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/IObjectUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/IObjectUpdate.java
index a6589af1347..97b3ff92488 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/IObjectUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/IObjectUpdate.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.asapi.v3.dto.common.update;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/IUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/IUpdate.java
index cd6504419c6..7418cdaab2f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/IUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/IUpdate.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.asapi.v3.dto.common.update;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/IdListUpdateValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/IdListUpdateValue.java
index 59592c2e6e8..1c174cba54c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/IdListUpdateValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/IdListUpdateValue.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.asapi.v3.dto.common.update;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/ListUpdateMapValues.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/ListUpdateMapValues.java
index fc91378eee0..92cc0015fea 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/ListUpdateMapValues.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/ListUpdateMapValues.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.asapi.v3.dto.common.update;
 
 import java.util.Collections;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/ListUpdateValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/ListUpdateValue.java
index 678d3f1f4b2..877af66a9bf 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/ListUpdateValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/ListUpdateValue.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.asapi.v3.dto.common.update;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/RelationshipUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/RelationshipUpdate.java
index 3b7ccb9cbb0..4cef3d39ab9 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/RelationshipUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/RelationshipUpdate.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.asapi.v3.dto.common.update;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/UpdateObjectsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/UpdateObjectsOperation.java
index f21254095f8..536b38ed167 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/UpdateObjectsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/UpdateObjectsOperation.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.asapi.v3.dto.common.update;
 
 import java.util.Arrays;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/UpdateObjectsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/UpdateObjectsOperationResult.java
index 80b824b2b9a..972be93ca09 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/UpdateObjectsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/common/update/UpdateObjectsOperationResult.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.asapi.v3.dto.common.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/ArchivingStatus.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/ArchivingStatus.java
index b929ffd505f..00cd84bb3a7 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/ArchivingStatus.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/ArchivingStatus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/Complete.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/Complete.java
index d667f45b1de..03a060774bc 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/Complete.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/Complete.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/ContentCopy.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/ContentCopy.java
index 698f571429d..26e404425b7 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/ContentCopy.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/ContentCopy.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/DataSet.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/DataSet.java
index 642d8645c08..d9268f3e4f9 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/DataSet.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/DataSet.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/DataSetKind.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/DataSetKind.java
index d5fe1af7e4b..f1bba7bdb68 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/DataSetKind.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/DataSetKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/DataSetType.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/DataSetType.java
index fbbed498d8e..7e0442b7e04 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/DataSetType.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/DataSetType.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/FileFormatType.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/FileFormatType.java
index e156a6572c2..6fe4becafe7 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/FileFormatType.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/FileFormatType.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/LinkedData.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/LinkedData.java
index 3ef279c4634..186ae9f6993 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/LinkedData.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/LinkedData.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/LocatorType.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/LocatorType.java
index 5e3b31fb62e..b4665e1439f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/LocatorType.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/LocatorType.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/PhysicalData.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/PhysicalData.java
index d841f2e9842..f9686198af7 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/PhysicalData.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/PhysicalData.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/StorageFormat.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/StorageFormat.java
index dd546e3399e..56ca82c3bbe 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/StorageFormat.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/StorageFormat.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/archive/ArchiveDataSetsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/archive/ArchiveDataSetsOperation.java
index 53571fb3581..5364be1e479 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/archive/ArchiveDataSetsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/archive/ArchiveDataSetsOperation.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.asapi.v3.dto.dataset.archive;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/archive/ArchiveDataSetsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/archive/ArchiveDataSetsOperationResult.java
index 88bb5b14c2b..9cb642eac46 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/archive/ArchiveDataSetsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/archive/ArchiveDataSetsOperationResult.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.asapi.v3.dto.dataset.archive;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/archive/DataSetArchiveOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/archive/DataSetArchiveOptions.java
index 53820428f7b..7f6306e228f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/archive/DataSetArchiveOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/archive/DataSetArchiveOptions.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.asapi.v3.dto.dataset.archive;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/ContentCopyCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/ContentCopyCreation.java
index 3bf5521fbf8..6e5e7c01bed 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/ContentCopyCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/ContentCopyCreation.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.asapi.v3.dto.dataset.create;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/CreateDataSetTypesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/CreateDataSetTypesOperation.java
index d061f22c885..f5efee5f51e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/CreateDataSetTypesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/CreateDataSetTypesOperation.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.asapi.v3.dto.dataset.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/CreateDataSetTypesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/CreateDataSetTypesOperationResult.java
index cc0f5c8341e..0e530274894 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/CreateDataSetTypesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/CreateDataSetTypesOperationResult.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.asapi.v3.dto.dataset.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/CreateDataSetsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/CreateDataSetsOperation.java
index c019fdaa56b..bb2a6d05909 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/CreateDataSetsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/CreateDataSetsOperation.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.asapi.v3.dto.dataset.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/CreateDataSetsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/CreateDataSetsOperationResult.java
index 7ed5a749ac0..b6a3c23e55b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/CreateDataSetsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/CreateDataSetsOperationResult.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.asapi.v3.dto.dataset.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/DataSetCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/DataSetCreation.java
index aa17876ee46..731137a7681 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/DataSetCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/DataSetCreation.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.asapi.v3.dto.dataset.create;
 
 import java.util.Date;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/DataSetTypeCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/DataSetTypeCreation.java
index dd87c27da19..a954271daf8 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/DataSetTypeCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/DataSetTypeCreation.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.asapi.v3.dto.dataset.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/LinkedDataCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/LinkedDataCreation.java
index ebfda91d29a..ae55c2f2350 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/LinkedDataCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/LinkedDataCreation.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.asapi.v3.dto.dataset.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/PhysicalDataCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/PhysicalDataCreation.java
index facdbb9df77..6a5ac730391 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/PhysicalDataCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/PhysicalDataCreation.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.asapi.v3.dto.dataset.create;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/delete/DataSetDeletionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/delete/DataSetDeletionOptions.java
index e056a77b44e..97050261184 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/delete/DataSetDeletionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/delete/DataSetDeletionOptions.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.asapi.v3.dto.dataset.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.AbstractObjectDeletionOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/delete/DataSetTypeDeletionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/delete/DataSetTypeDeletionOptions.java
index 57861d3eb18..be9ab837e03 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/delete/DataSetTypeDeletionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/delete/DataSetTypeDeletionOptions.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.asapi.v3.dto.dataset.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.AbstractObjectDeletionOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/delete/DeleteDataSetTypesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/delete/DeleteDataSetTypesOperation.java
index 7e2b913eb13..43638155b3e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/delete/DeleteDataSetTypesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/delete/DeleteDataSetTypesOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.delete;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/delete/DeleteDataSetTypesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/delete/DeleteDataSetTypesOperationResult.java
index a7182f275e9..8ee96d4bc66 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/delete/DeleteDataSetTypesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/delete/DeleteDataSetTypesOperationResult.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.asapi.v3.dto.dataset.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.delete.DeleteObjectsWithoutTrashOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/delete/DeleteDataSetsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/delete/DeleteDataSetsOperation.java
index adcdd99a50e..6cbadfbb575 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/delete/DeleteDataSetsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/delete/DeleteDataSetsOperation.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.asapi.v3.dto.dataset.delete;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/delete/DeleteDataSetsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/delete/DeleteDataSetsOperationResult.java
index 87f522171c8..f5de1bc810d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/delete/DeleteDataSetsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/delete/DeleteDataSetsOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.delete.DeleteObjectsWithTrashOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetFetchOptions.java
index d2ea8ae70e7..52e6b171046 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetFetchOptions.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetSortOptions.java
index 4d58fef8856..0ea021d44d4 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetSortOptions.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.asapi.v3.dto.dataset.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.EntityWithPropertiesSortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetTypeFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetTypeFetchOptions.java
index 1005c772f3a..b3aa82996f5 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetTypeFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetTypeFetchOptions.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetTypeSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetTypeSortOptions.java
index 3b15398ba18..c8cdf3e9475 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetTypeSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/DataSetTypeSortOptions.java
@@ -1,6 +1,6 @@
 /*
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
- * Copyright 2015 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
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/FileFormatTypeFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/FileFormatTypeFetchOptions.java
index 7cd0b82d0b7..d80c31ab926 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/FileFormatTypeFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/FileFormatTypeFetchOptions.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/FileFormatTypeSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/FileFormatTypeSortOptions.java
index 4aff54a43bd..80fa123baff 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/FileFormatTypeSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/FileFormatTypeSortOptions.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.asapi.v3.dto.dataset.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LinkedDataFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LinkedDataFetchOptions.java
index e5139675f56..4c0f8b7a48f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LinkedDataFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LinkedDataFetchOptions.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LinkedDataSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LinkedDataSortOptions.java
index a25fcb61561..789f43b472f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LinkedDataSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LinkedDataSortOptions.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.asapi.v3.dto.dataset.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LocatorTypeFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LocatorTypeFetchOptions.java
index 50d664e5c5b..8bd02f79bd3 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LocatorTypeFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LocatorTypeFetchOptions.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LocatorTypeSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LocatorTypeSortOptions.java
index 5854b7ca9a2..46b323ce1f4 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LocatorTypeSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/LocatorTypeSortOptions.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.asapi.v3.dto.dataset.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/PhysicalDataFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/PhysicalDataFetchOptions.java
index 45dbcdf3b40..c9739cc3cc1 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/PhysicalDataFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/PhysicalDataFetchOptions.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/PhysicalDataSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/PhysicalDataSortOptions.java
index b4f2b13dd3c..af0b6bcf131 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/PhysicalDataSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/PhysicalDataSortOptions.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.asapi.v3.dto.dataset.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/StorageFormatFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/StorageFormatFetchOptions.java
index 9e9286da91b..3541a9506e8 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/StorageFormatFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/StorageFormatFetchOptions.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/StorageFormatSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/StorageFormatSortOptions.java
index ac304ac1cfd..f12a54f59c0 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/StorageFormatSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/fetchoptions/StorageFormatSortOptions.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.asapi.v3.dto.dataset.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/get/GetDataSetTypesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/get/GetDataSetTypesOperation.java
index 8217e6bb1ac..2628e968544 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/get/GetDataSetTypesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/get/GetDataSetTypesOperation.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.asapi.v3.dto.dataset.get;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/get/GetDataSetTypesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/get/GetDataSetTypesOperationResult.java
index 7a61d98ff62..c92b1ea5f87 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/get/GetDataSetTypesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/get/GetDataSetTypesOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.get;
 
 import java.util.Map;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/get/GetDataSetsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/get/GetDataSetsOperation.java
index b1049366d9c..d4976fc1fe2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/get/GetDataSetsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/get/GetDataSetsOperation.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.asapi.v3.dto.dataset.get;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/get/GetDataSetsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/get/GetDataSetsOperationResult.java
index 9d4d3d9621c..1c0776d0e2b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/get/GetDataSetsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/get/GetDataSetsOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.get;
 
 import java.util.Map;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/history/DataSetRelationType.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/history/DataSetRelationType.java
index 16f58f7087c..745e8ee90bc 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/history/DataSetRelationType.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/history/DataSetRelationType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.history;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.history.IRelationType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/BdsDirectoryStorageFormatPermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/BdsDirectoryStorageFormatPermId.java
index d9e01ae46cb..54ba248bfc2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/BdsDirectoryStorageFormatPermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/BdsDirectoryStorageFormatPermId.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.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/ContentCopyPermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/ContentCopyPermId.java
index f54bc03d928..db6f1bd90d7 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/ContentCopyPermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/ContentCopyPermId.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.asapi.v3.dto.dataset.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectPermId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/DataSetPermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/DataSetPermId.java
index 3b7c41d1e32..e4aa886935a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/DataSetPermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/DataSetPermId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectPermId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/FileFormatTypePermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/FileFormatTypePermId.java
index 01fd772b685..efd426807a3 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/FileFormatTypePermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/FileFormatTypePermId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectPermId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IContentCopyId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IContentCopyId.java
index 0239765000e..ef480eba263 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IContentCopyId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IContentCopyId.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.asapi.v3.dto.dataset.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IDataSetId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IDataSetId.java
index 93e3ef67ff6..72aff3b74d5 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IDataSetId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IDataSetId.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.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IFileFormatTypeId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IFileFormatTypeId.java
index d5852e515f0..710dc7fef6d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IFileFormatTypeId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IFileFormatTypeId.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.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/ILocatorTypeId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/ILocatorTypeId.java
index 1c2f8e2ddde..fc822cde94b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/ILocatorTypeId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/ILocatorTypeId.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.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IStorageFormatId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IStorageFormatId.java
index 5ea1d2c3b40..89f20f0fe2b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IStorageFormatId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/IStorageFormatId.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.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/LocatorTypePermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/LocatorTypePermId.java
index c928769f048..617a51eecfd 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/LocatorTypePermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/LocatorTypePermId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectPermId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/ProprietaryStorageFormatPermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/ProprietaryStorageFormatPermId.java
index 3df662cc16f..7a2c08c2ecd 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/ProprietaryStorageFormatPermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/ProprietaryStorageFormatPermId.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.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/RelativeLocationLocatorTypePermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/RelativeLocationLocatorTypePermId.java
index 105f000ec67..d74af973748 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/RelativeLocationLocatorTypePermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/RelativeLocationLocatorTypePermId.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.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/StorageFormatPermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/StorageFormatPermId.java
index 8cff162f601..3a43630ebff 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/StorageFormatPermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/id/StorageFormatPermId.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.asapi.v3.dto.dataset.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectPermId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/lock/DataSetLockOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/lock/DataSetLockOptions.java
index a9a055e6441..971caae8c2b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/lock/DataSetLockOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/lock/DataSetLockOptions.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.asapi.v3.dto.dataset.lock;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/lock/LockDataSetsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/lock/LockDataSetsOperation.java
index 54495d7f280..5b7d03c5e3d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/lock/LockDataSetsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/lock/LockDataSetsOperation.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.asapi.v3.dto.dataset.lock;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/lock/LockDataSetsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/lock/LockDataSetsOperationResult.java
index 89f1ab9ca69..31b1813378d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/lock/LockDataSetsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/lock/LockDataSetsOperationResult.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.asapi.v3.dto.dataset.lock;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/AbstractDataSetSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/AbstractDataSetSearchCriteria.java
index c34131145d6..fb30111f881 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/AbstractDataSetSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/AbstractDataSetSearchCriteria.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.asapi.v3.dto.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractEntitySearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/ArchivingRequestedSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/ArchivingRequestedSearchCriteria.java
index 0cb30176206..5037f4ac62d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/ArchivingRequestedSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/ArchivingRequestedSearchCriteria.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.asapi.v3.dto.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.BooleanFieldSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/CompleteSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/CompleteSearchCriteria.java
index f67dc7e8e04..511f00ecacd 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/CompleteSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/CompleteSearchCriteria.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.asapi.v3.dto.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.EnumFieldSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/ContentCopySearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/ContentCopySearchCriteria.java
index f22e999d99d..1092373cf28 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/ContentCopySearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/ContentCopySearchCriteria.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.asapi.v3.dto.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractObjectSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetChildrenSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetChildrenSearchCriteria.java
index f10d2dc9bb5..deb19daea4e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetChildrenSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetChildrenSearchCriteria.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.asapi.v3.dto.dataset.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetContainerSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetContainerSearchCriteria.java
index 4a2e7b23817..c4e00a4307b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetContainerSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetContainerSearchCriteria.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.asapi.v3.dto.dataset.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetParentsSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetParentsSearchCriteria.java
index a5b0c80e1e9..035cbc9d4e5 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetParentsSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetParentsSearchCriteria.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.asapi.v3.dto.dataset.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetSearchCriteria.java
index a63ed876691..d95ea54aff8 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetSearchCriteria.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.asapi.v3.dto.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.TextAttributeSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetSearchRelation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetSearchRelation.java
index a4b82b31950..37b8a1f1fa0 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetSearchRelation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetSearchRelation.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.asapi.v3.dto.dataset.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetTypeSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetTypeSearchCriteria.java
index f7381cf3268..a8e11ee9a8a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetTypeSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/DataSetTypeSearchCriteria.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.asapi.v3.dto.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchCriteriaToStringBuilder;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/ExternalCodeSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/ExternalCodeSearchCriteria.java
index 8d104f8d81c..33130d19e35 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/ExternalCodeSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/ExternalCodeSearchCriteria.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.asapi.v3.dto.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/ExternalDmsSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/ExternalDmsSearchCriteria.java
index 22abf7688b9..a5bf146c647 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/ExternalDmsSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/ExternalDmsSearchCriteria.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.asapi.v3.dto.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractObjectSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/FileFormatTypeSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/FileFormatTypeSearchCriteria.java
index c803529f70d..2e966e34247 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/FileFormatTypeSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/FileFormatTypeSearchCriteria.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.asapi.v3.dto.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractCompositeSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/GitCommitHashSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/GitCommitHashSearchCriteria.java
index 79c4f4cbfff..97231b96a2f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/GitCommitHashSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/GitCommitHashSearchCriteria.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.asapi.v3.dto.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/GitRepositoryIdSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/GitRepositoryIdSearchCriteria.java
index 0a5aa0d92fb..ac0d1fb4659 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/GitRepositoryIdSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/GitRepositoryIdSearchCriteria.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.asapi.v3.dto.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/LinkedDataSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/LinkedDataSearchCriteria.java
index 63c079f34b1..df1d20e5918 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/LinkedDataSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/LinkedDataSearchCriteria.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.asapi.v3.dto.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractCompositeSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/LocationSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/LocationSearchCriteria.java
index 534b5de3be9..7e2c0ac3dd7 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/LocationSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/LocationSearchCriteria.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.asapi.v3.dto.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/LocatorTypeSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/LocatorTypeSearchCriteria.java
index 788bf112522..ae51605c371 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/LocatorTypeSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/LocatorTypeSearchCriteria.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.asapi.v3.dto.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractCompositeSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/PathSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/PathSearchCriteria.java
index c161c47d0a9..594a9ee8bb1 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/PathSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/PathSearchCriteria.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.asapi.v3.dto.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/PhysicalDataSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/PhysicalDataSearchCriteria.java
index 7bbd6f10188..2723c99d05b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/PhysicalDataSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/PhysicalDataSearchCriteria.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.asapi.v3.dto.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractCompositeSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/PresentInArchiveSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/PresentInArchiveSearchCriteria.java
index 7639bae4fec..926ba502c56 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/PresentInArchiveSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/PresentInArchiveSearchCriteria.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.asapi.v3.dto.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.BooleanFieldSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/SearchDataSetTypesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/SearchDataSetTypesOperation.java
index 65077a6f3e9..ba3d8b65648 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/SearchDataSetTypesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/SearchDataSetTypesOperation.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.asapi.v3.dto.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/SearchDataSetTypesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/SearchDataSetTypesOperationResult.java
index d2d5ef07c9e..c6d3c9b6fd8 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/SearchDataSetTypesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/SearchDataSetTypesOperationResult.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.asapi.v3.dto.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/SearchDataSetsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/SearchDataSetsOperation.java
index 6d5b8acaa0c..dc07d892160 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/SearchDataSetsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/SearchDataSetsOperation.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.asapi.v3.dto.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/SearchDataSetsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/SearchDataSetsOperationResult.java
index 116060c7880..6fa1dfe3efe 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/SearchDataSetsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/SearchDataSetsOperationResult.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.asapi.v3.dto.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/ShareIdSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/ShareIdSearchCriteria.java
index 79f9b857071..ce0d57d5426 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/ShareIdSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/ShareIdSearchCriteria.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.asapi.v3.dto.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/SizeSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/SizeSearchCriteria.java
index 7eb486fcb16..6803b4efd2f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/SizeSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/SizeSearchCriteria.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.asapi.v3.dto.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.NumberFieldSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/SpeedHintSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/SpeedHintSearchCriteria.java
index 6c098568a9f..dfe6796f5f1 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/SpeedHintSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/SpeedHintSearchCriteria.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.asapi.v3.dto.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.NumberFieldSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/StatusSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/StatusSearchCriteria.java
index e222956fc7c..c5eeaf7e488 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/StatusSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/StatusSearchCriteria.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.asapi.v3.dto.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.EnumFieldSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/StorageConfirmationSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/StorageConfirmationSearchCriteria.java
index f8277866dc6..116dca664a2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/StorageConfirmationSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/StorageConfirmationSearchCriteria.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.asapi.v3.dto.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.BooleanFieldSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/StorageFormatSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/StorageFormatSearchCriteria.java
index 15819a88157..d8ed0cf6a0e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/StorageFormatSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/search/StorageFormatSearchCriteria.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.asapi.v3.dto.dataset.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractCompositeSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/unarchive/DataSetUnarchiveOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/unarchive/DataSetUnarchiveOptions.java
index 07d994c290c..4210cc20500 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/unarchive/DataSetUnarchiveOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/unarchive/DataSetUnarchiveOptions.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.asapi.v3.dto.dataset.unarchive;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/unarchive/UnarchiveDataSetsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/unarchive/UnarchiveDataSetsOperation.java
index c22f88ffb89..b4886f2c1e2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/unarchive/UnarchiveDataSetsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/unarchive/UnarchiveDataSetsOperation.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.asapi.v3.dto.dataset.unarchive;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/unarchive/UnarchiveDataSetsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/unarchive/UnarchiveDataSetsOperationResult.java
index 465621a1ffc..02ea0dcbfa5 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/unarchive/UnarchiveDataSetsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/unarchive/UnarchiveDataSetsOperationResult.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.asapi.v3.dto.dataset.unarchive;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/unlock/DataSetUnlockOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/unlock/DataSetUnlockOptions.java
index f03bbb85aed..e92e1aab2d8 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/unlock/DataSetUnlockOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/unlock/DataSetUnlockOptions.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.asapi.v3.dto.dataset.unlock;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/unlock/UnlockDataSetsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/unlock/UnlockDataSetsOperation.java
index fa7345686d2..6ddf39b360b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/unlock/UnlockDataSetsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/unlock/UnlockDataSetsOperation.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.asapi.v3.dto.dataset.unlock;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/unlock/UnlockDataSetsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/unlock/UnlockDataSetsOperationResult.java
index 8191c154ad6..5c6dc21172f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/unlock/UnlockDataSetsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/unlock/UnlockDataSetsOperationResult.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.asapi.v3.dto.dataset.unlock;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/ContentCopyListUpdateValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/ContentCopyListUpdateValue.java
index 1857a3e7174..9ffa153ef67 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/ContentCopyListUpdateValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/ContentCopyListUpdateValue.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.asapi.v3.dto.dataset.update;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.update.ListUpdateValue;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/DataSetTypeUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/DataSetTypeUpdate.java
index c8be592d9cd..37a6901b2c1 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/DataSetTypeUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/DataSetTypeUpdate.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.asapi.v3.dto.dataset.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/DataSetUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/DataSetUpdate.java
index eb15859c613..92a09a7fc25 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/DataSetUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/DataSetUpdate.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.asapi.v3.dto.dataset.update;
 
 import java.util.HashMap;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/LinkedDataUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/LinkedDataUpdate.java
index a8427be5932..bb703eb760e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/LinkedDataUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/LinkedDataUpdate.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.asapi.v3.dto.dataset.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/PhysicalDataUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/PhysicalDataUpdate.java
index 7e268831ed3..c3cc7d0e4b6 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/PhysicalDataUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/PhysicalDataUpdate.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.asapi.v3.dto.dataset.update;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/UpdateDataSetTypesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/UpdateDataSetTypesOperation.java
index 7957adcc69e..007bcd1c2ca 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/UpdateDataSetTypesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/UpdateDataSetTypesOperation.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.asapi.v3.dto.dataset.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/UpdateDataSetTypesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/UpdateDataSetTypesOperationResult.java
index a8f699b6a73..785a75b2f1e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/UpdateDataSetTypesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/UpdateDataSetTypesOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/UpdateDataSetsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/UpdateDataSetsOperation.java
index dbad1576f3e..e5c45968cf3 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/UpdateDataSetsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/UpdateDataSetsOperation.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.asapi.v3.dto.dataset.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/UpdateDataSetsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/UpdateDataSetsOperationResult.java
index 63eb38df777..bc3e633f9ef 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/UpdateDataSetsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/UpdateDataSetsOperationResult.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.asapi.v3.dto.dataset.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/DataStore.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/DataStore.java
index d3ed71a25e5..ab22cfd8dbb 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/DataStore.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/DataStore.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/fetchoptions/DataStoreFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/fetchoptions/DataStoreFetchOptions.java
index 326ae990d81..955ea536fe0 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/fetchoptions/DataStoreFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/fetchoptions/DataStoreFetchOptions.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/fetchoptions/DataStoreSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/fetchoptions/DataStoreSortOptions.java
index eefe9c0508e..45d313a1b8a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/fetchoptions/DataStoreSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/fetchoptions/DataStoreSortOptions.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.asapi.v3.dto.datastore.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/id/DataStorePermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/id/DataStorePermId.java
index 0a1f619ee17..f3f964dcd6d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/id/DataStorePermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/id/DataStorePermId.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.asapi.v3.dto.datastore.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectPermId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/id/IDataStoreId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/id/IDataStoreId.java
index f41d31b31e9..5810107a1a1 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/id/IDataStoreId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/id/IDataStoreId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.datastore.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/search/DataStoreSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/search/DataStoreSearchCriteria.java
index 115a4605205..9de25a03ca3 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/search/DataStoreSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/search/DataStoreSearchCriteria.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.asapi.v3.dto.datastore.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractObjectSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/search/SearchDataStoresOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/search/SearchDataStoresOperation.java
index bb6f23e1f71..2d32584aa31 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/search/SearchDataStoresOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/search/SearchDataStoresOperation.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.asapi.v3.dto.datastore.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/search/SearchDataStoresOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/search/SearchDataStoresOperationResult.java
index c13030ec27d..0e425fd9107 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/search/SearchDataStoresOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/datastore/search/SearchDataStoresOperationResult.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.asapi.v3.dto.datastore.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/AbstractObjectDeletionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/AbstractObjectDeletionOptions.java
index 2e31c4436a8..966f5eb6815 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/AbstractObjectDeletionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/AbstractObjectDeletionOptions.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.asapi.v3.dto.deletion;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/DeletedObject.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/DeletedObject.java
index 3df42e42333..a85df59948e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/DeletedObject.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/DeletedObject.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.asapi.v3.dto.deletion;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/Deletion.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/Deletion.java
index 72214f068e5..5f81fd39f2d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/Deletion.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/Deletion.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/confirm/ConfirmDeletionsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/confirm/ConfirmDeletionsOperation.java
index 536f95ab8c7..abec856d70c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/confirm/ConfirmDeletionsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/confirm/ConfirmDeletionsOperation.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.asapi.v3.dto.deletion.confirm;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/confirm/ConfirmDeletionsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/confirm/ConfirmDeletionsOperationResult.java
index fcb26bdabfa..05ba414253d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/confirm/ConfirmDeletionsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/confirm/ConfirmDeletionsOperationResult.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.asapi.v3.dto.deletion.confirm;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/fetchoptions/DeletedObjectFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/fetchoptions/DeletedObjectFetchOptions.java
index 0ac75e64b1a..a99d82d0702 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/fetchoptions/DeletedObjectFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/fetchoptions/DeletedObjectFetchOptions.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.asapi.v3.dto.deletion.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.EmptyFetchOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/fetchoptions/DeletionFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/fetchoptions/DeletionFetchOptions.java
index c09f21fefef..cafdffa0889 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/fetchoptions/DeletionFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/fetchoptions/DeletionFetchOptions.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/fetchoptions/DeletionSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/fetchoptions/DeletionSortOptions.java
index 0c4cbec97bc..2bde1587fd0 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/fetchoptions/DeletionSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/fetchoptions/DeletionSortOptions.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.asapi.v3.dto.deletion.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/id/DeletionTechId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/id/DeletionTechId.java
index e051f4ecd86..ed9ecd5e57d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/id/DeletionTechId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/id/DeletionTechId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectTechId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/id/IDeletionId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/id/IDeletionId.java
index b76d6f2f8b5..5fc71058d29 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/id/IDeletionId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/id/IDeletionId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/revert/RevertDeletionsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/revert/RevertDeletionsOperation.java
index b15b23fc212..91a13dcbce7 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/revert/RevertDeletionsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/revert/RevertDeletionsOperation.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.asapi.v3.dto.deletion.revert;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/revert/RevertDeletionsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/revert/RevertDeletionsOperationResult.java
index 281f5247aac..ba0b89fdf21 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/revert/RevertDeletionsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/revert/RevertDeletionsOperationResult.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.asapi.v3.dto.deletion.revert;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/search/DeletionSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/search/DeletionSearchCriteria.java
index 0986903d241..75cb6f5f896 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/search/DeletionSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/search/DeletionSearchCriteria.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.asapi.v3.dto.deletion.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractObjectSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/search/SearchDeletionsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/search/SearchDeletionsOperation.java
index 5d146478e90..678dfa9ba08 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/search/SearchDeletionsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/search/SearchDeletionsOperation.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.asapi.v3.dto.deletion.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/search/SearchDeletionsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/search/SearchDeletionsOperationResult.java
index 6ca013520b6..3fbd22a370e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/search/SearchDeletionsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/search/SearchDeletionsOperationResult.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.asapi.v3.dto.deletion.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entity/create/CreateCodesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entity/create/CreateCodesOperation.java
index d534a459dbf..8d3ed0bae59 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entity/create/CreateCodesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entity/create/CreateCodesOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 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.asapi.v3.dto.entity.create;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entity/create/CreateCodesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entity/create/CreateCodesOperationResult.java
index 2e586658bfa..76a9032085b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entity/create/CreateCodesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entity/create/CreateCodesOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.entity.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entity/create/CreatePermIdsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entity/create/CreatePermIdsOperation.java
index 932a4f668db..8a6a2f4f5bf 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entity/create/CreatePermIdsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entity/create/CreatePermIdsOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.entity.create;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entity/create/CreatePermIdsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entity/create/CreatePermIdsOperationResult.java
index dc8de223abb..38f57dc9404 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entity/create/CreatePermIdsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entity/create/CreatePermIdsOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.entity.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/EntityKind.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/EntityKind.java
index ed235c96903..33725fb1bba 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/EntityKind.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/EntityKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/create/IEntityTypeCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/create/IEntityTypeCreation.java
index ae2f11d3b05..2fcc29e8e85 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/create/IEntityTypeCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/create/IEntityTypeCreation.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.asapi.v3.dto.entitytype.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/fetchoptions/EntityTypeFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/fetchoptions/EntityTypeFetchOptions.java
index 2d559aebf8f..fef902ca346 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/fetchoptions/EntityTypeFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/fetchoptions/EntityTypeFetchOptions.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.asapi.v3.dto.entitytype.fetchoptions;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/fetchoptions/EntityTypeSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/fetchoptions/EntityTypeSortOptions.java
index e0776817f5b..0b379d035a4 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/fetchoptions/EntityTypeSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/fetchoptions/EntityTypeSortOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/id/EntityTypePermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/id/EntityTypePermId.java
index bf1a48c5515..2136176c997 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/id/EntityTypePermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/id/EntityTypePermId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectPermId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/id/IEntityTypeId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/id/IEntityTypeId.java
index d9a9fffa852..2bf82ed9579 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/id/IEntityTypeId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/id/IEntityTypeId.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.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/search/AbstractEntityTypeSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/search/AbstractEntityTypeSearchCriteria.java
index df708a73368..e00126f811b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/search/AbstractEntityTypeSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/search/AbstractEntityTypeSearchCriteria.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.asapi.v3.dto.entitytype.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractObjectSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/search/EntityKindSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/search/EntityKindSearchCriteria.java
index 8fe58955b4b..d78f9a77114 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/search/EntityKindSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/search/EntityKindSearchCriteria.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.asapi.v3.dto.entitytype.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.EnumFieldSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/search/EntityTypeSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/search/EntityTypeSearchCriteria.java
index 58894bf1bfa..bd708381449 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/search/EntityTypeSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/search/EntityTypeSearchCriteria.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.asapi.v3.dto.entitytype.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractObjectSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/update/IEntityTypeUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/update/IEntityTypeUpdate.java
index 8ea3b2c2edf..88e1ed4e896 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/update/IEntityTypeUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/update/IEntityTypeUpdate.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.asapi.v3.dto.entitytype.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/update/PropertyAssignmentListUpdateValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/update/PropertyAssignmentListUpdateValue.java
index 9814ced560c..e4f89fd5216 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/update/PropertyAssignmentListUpdateValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/entitytype/update/PropertyAssignmentListUpdateValue.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.asapi.v3.dto.entitytype.update;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/EntityType.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/EntityType.java
index f32046a357a..7f79d717134 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/EntityType.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/EntityType.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.asapi.v3.dto.event;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/Event.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/Event.java
index a741cf08c35..aa9ead8bd98 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/Event.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/Event.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/EventType.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/EventType.java
index 0bb1324cfe3..61f85e30736 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/EventType.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/EventType.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.asapi.v3.dto.event;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/fetchoptions/EventFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/fetchoptions/EventFetchOptions.java
index df2805a6d68..e3ae9358985 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/fetchoptions/EventFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/fetchoptions/EventFetchOptions.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/fetchoptions/EventSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/fetchoptions/EventSortOptions.java
index 4b2a90acbba..78767dae0c7 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/fetchoptions/EventSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/fetchoptions/EventSortOptions.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.asapi.v3.dto.event.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/id/EventTechId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/id/EventTechId.java
index 1821e87e9da..69dc3913ca8 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/id/EventTechId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/id/EventTechId.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.asapi.v3.dto.event.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectTechId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/id/IEventId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/id/IEventId.java
index d26f459b41c..78cd6e70f0a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/id/IEventId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/id/IEventId.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.asapi.v3.dto.event.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventDescriptionSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventDescriptionSearchCriteria.java
index 8a98096c2d3..e15cff697a5 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventDescriptionSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventDescriptionSearchCriteria.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.asapi.v3.dto.event.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventEntityProjectIdSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventEntityProjectIdSearchCriteria.java
index 79e6446f9e4..17a8029e289 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventEntityProjectIdSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventEntityProjectIdSearchCriteria.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.asapi.v3.dto.event.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventEntityProjectSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventEntityProjectSearchCriteria.java
index b99cbf637bb..9670d84681d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventEntityProjectSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventEntityProjectSearchCriteria.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.asapi.v3.dto.event.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventEntityRegistrationDateSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventEntityRegistrationDateSearchCriteria.java
index 0cda0bd1c9f..c2b119776c7 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventEntityRegistrationDateSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventEntityRegistrationDateSearchCriteria.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.asapi.v3.dto.event.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.DateFieldSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventEntityRegistratorSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventEntityRegistratorSearchCriteria.java
index 0c6e370cc39..cdcdc483412 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventEntityRegistratorSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventEntityRegistratorSearchCriteria.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.asapi.v3.dto.event.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventEntitySpaceIdSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventEntitySpaceIdSearchCriteria.java
index 69de74e3414..fe7a7a59e73 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventEntitySpaceIdSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventEntitySpaceIdSearchCriteria.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.asapi.v3.dto.event.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventEntitySpaceSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventEntitySpaceSearchCriteria.java
index 2d3ea0b9535..58a480787b2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventEntitySpaceSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventEntitySpaceSearchCriteria.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.asapi.v3.dto.event.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventEntityTypeSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventEntityTypeSearchCriteria.java
index 2579cc230e2..74e9ef88562 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventEntityTypeSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventEntityTypeSearchCriteria.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.asapi.v3.dto.event.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.EnumFieldSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventIdentifierSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventIdentifierSearchCriteria.java
index 7a901fe9d5c..c4f9cd2cac8 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventIdentifierSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventIdentifierSearchCriteria.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.asapi.v3.dto.event.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventReasonSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventReasonSearchCriteria.java
index 8c80544c738..c75f97eb3c0 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventReasonSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventReasonSearchCriteria.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.asapi.v3.dto.event.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventSearchCriteria.java
index 92dc5fdcb80..65532427a41 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventSearchCriteria.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.asapi.v3.dto.event.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractObjectSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventTypeSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventTypeSearchCriteria.java
index 68452165170..07278575ee5 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventTypeSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/EventTypeSearchCriteria.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.asapi.v3.dto.event.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.EnumFieldSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/SearchEventsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/SearchEventsOperation.java
index 9073b8e11e6..00ab1fd739f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/SearchEventsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/SearchEventsOperation.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.asapi.v3.dto.event.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/SearchEventsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/SearchEventsOperationResult.java
index 187866fb3e5..dd3f5fba0f4 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/SearchEventsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/event/search/SearchEventsOperationResult.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.asapi.v3.dto.event.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/Experiment.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/Experiment.java
index 0683307f70d..b31650ecc9f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/Experiment.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/Experiment.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/ExperimentType.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/ExperimentType.java
index 68169808d23..eed4b0fbe7d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/ExperimentType.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/ExperimentType.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentTypesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentTypesOperation.java
index c3678186e4f..de965407615 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentTypesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentTypesOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentTypesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentTypesOperationResult.java
index 98657d0be68..fa2afa061c6 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentTypesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentTypesOperationResult.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.asapi.v3.dto.experiment.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentsOperation.java
index 547f0541910..7ed94a5ec6f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentsOperation.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.ethz.sis.openbis.generic.asapi.v3.dto.experiment.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentsOperationResult.java
index bd32967d68e..48ac1f3b30c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/CreateExperimentsOperationResult.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.ethz.sis.openbis.generic.asapi.v3.dto.experiment.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/ExperimentCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/ExperimentCreation.java
index bd1ab132d94..abab7c68636 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/ExperimentCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/ExperimentCreation.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.asapi.v3.dto.experiment.create;
 
 import java.util.HashMap;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/ExperimentTypeCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/ExperimentTypeCreation.java
index 0c4a9f18c81..1eb1ac1ea86 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/ExperimentTypeCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/ExperimentTypeCreation.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.asapi.v3.dto.experiment.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/delete/DeleteExperimentTypesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/delete/DeleteExperimentTypesOperation.java
index 69582c77977..a4621d6d422 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/delete/DeleteExperimentTypesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/delete/DeleteExperimentTypesOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.delete;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/delete/DeleteExperimentTypesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/delete/DeleteExperimentTypesOperationResult.java
index ca2c5a8c90b..cf35b37fd20 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/delete/DeleteExperimentTypesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/delete/DeleteExperimentTypesOperationResult.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.asapi.v3.dto.experiment.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.delete.DeleteObjectsWithoutTrashOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/delete/DeleteExperimentsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/delete/DeleteExperimentsOperation.java
index db5a792e4f7..bbb09e3e9d3 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/delete/DeleteExperimentsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/delete/DeleteExperimentsOperation.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.asapi.v3.dto.experiment.delete;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/delete/DeleteExperimentsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/delete/DeleteExperimentsOperationResult.java
index a245bdd1247..681a82f458e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/delete/DeleteExperimentsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/delete/DeleteExperimentsOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.delete.DeleteObjectsWithTrashOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/delete/ExperimentDeletionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/delete/ExperimentDeletionOptions.java
index 8c3b54727e3..d49831c4a5f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/delete/ExperimentDeletionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/delete/ExperimentDeletionOptions.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.asapi.v3.dto.experiment.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.AbstractObjectDeletionOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/delete/ExperimentTypeDeletionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/delete/ExperimentTypeDeletionOptions.java
index 6a6d93e4020..b702de2b2f4 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/delete/ExperimentTypeDeletionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/delete/ExperimentTypeDeletionOptions.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.asapi.v3.dto.experiment.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.AbstractObjectDeletionOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentFetchOptions.java
index 515e1a14669..822dd587dc7 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentFetchOptions.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentSortOptions.java
index f5af2863423..f93c6ae2d53 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentSortOptions.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.asapi.v3.dto.experiment.fetchoptions;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentTypeFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentTypeFetchOptions.java
index 84a183d3cda..5e6c7fa628d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentTypeFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentTypeFetchOptions.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentTypeSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentTypeSortOptions.java
index 23bd60ef7c8..dfec3c84f0a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentTypeSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentTypeSortOptions.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.asapi.v3.dto.experiment.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/get/GetExperimentTypesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/get/GetExperimentTypesOperation.java
index e0fa0f6e260..00891ac2478 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/get/GetExperimentTypesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/get/GetExperimentTypesOperation.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.asapi.v3.dto.experiment.get;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/get/GetExperimentTypesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/get/GetExperimentTypesOperationResult.java
index 3b2527f50ba..dbd2f4010c2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/get/GetExperimentTypesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/get/GetExperimentTypesOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.get;
 
 import java.util.Map;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/get/GetExperimentsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/get/GetExperimentsOperation.java
index 652709525e8..5a754e1d397 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/get/GetExperimentsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/get/GetExperimentsOperation.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.asapi.v3.dto.experiment.get;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/get/GetExperimentsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/get/GetExperimentsOperationResult.java
index d25d915bbc4..2fc0d1fdf2c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/get/GetExperimentsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/get/GetExperimentsOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.get;
 
 import java.util.Map;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/history/ExperimentRelationType.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/history/ExperimentRelationType.java
index d4b1de0db53..4e095f0d405 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/history/ExperimentRelationType.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/history/ExperimentRelationType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.history;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.history.IRelationType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/id/ExperimentIdentifier.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/id/ExperimentIdentifier.java
index e8e4a68bf12..997245adb7c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/id/ExperimentIdentifier.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/id/ExperimentIdentifier.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.asapi.v3.dto.experiment.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectIdentifier;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/id/ExperimentPermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/id/ExperimentPermId.java
index 4912782c137..47a4c67897c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/id/ExperimentPermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/id/ExperimentPermId.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.asapi.v3.dto.experiment.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectPermId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/id/IExperimentId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/id/IExperimentId.java
index 06a7918daf3..89889d39a52 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/id/IExperimentId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/id/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.ethz.sis.openbis.generic.asapi.v3.dto.experiment.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/ExperimentSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/ExperimentSearchCriteria.java
index 123ab34fc30..90169c2d70e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/ExperimentSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/ExperimentSearchCriteria.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.asapi.v3.dto.experiment.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.*;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/ExperimentTypeSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/ExperimentTypeSearchCriteria.java
index c638de3245f..05337acd7ca 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/ExperimentTypeSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/ExperimentTypeSearchCriteria.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.asapi.v3.dto.experiment.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchCriteriaToStringBuilder;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/NoExperimentSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/NoExperimentSearchCriteria.java
index 36dc009f71c..0c882b250ad 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/NoExperimentSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/NoExperimentSearchCriteria.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/SearchExperimentTypesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/SearchExperimentTypesOperation.java
index 339b8b3461b..2784a42052a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/SearchExperimentTypesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/SearchExperimentTypesOperation.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.asapi.v3.dto.experiment.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/SearchExperimentTypesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/SearchExperimentTypesOperationResult.java
index 543e37fcf6b..c5ed6ac74f7 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/SearchExperimentTypesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/SearchExperimentTypesOperationResult.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.asapi.v3.dto.experiment.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/SearchExperimentsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/SearchExperimentsOperation.java
index 381ead713c8..627eb333112 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/SearchExperimentsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/SearchExperimentsOperation.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.asapi.v3.dto.experiment.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/SearchExperimentsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/SearchExperimentsOperationResult.java
index 3b9710a0d40..e3204b3f20b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/SearchExperimentsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/search/SearchExperimentsOperationResult.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.asapi.v3.dto.experiment.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/ExperimentTypeUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/ExperimentTypeUpdate.java
index 83408aae98b..f85fec055b4 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/ExperimentTypeUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/ExperimentTypeUpdate.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.asapi.v3.dto.experiment.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/ExperimentUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/ExperimentUpdate.java
index c5dbf86ac36..7193c3b5f66 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/ExperimentUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/ExperimentUpdate.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.asapi.v3.dto.experiment.update;
 
 import java.util.HashMap;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/UpdateExperimentTypesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/UpdateExperimentTypesOperation.java
index 72a044cb193..de11934c36a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/UpdateExperimentTypesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/UpdateExperimentTypesOperation.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.asapi.v3.dto.experiment.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/UpdateExperimentTypesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/UpdateExperimentTypesOperationResult.java
index ff119aa014b..9c2b9ad9a3d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/UpdateExperimentTypesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/UpdateExperimentTypesOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/UpdateExperimentsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/UpdateExperimentsOperation.java
index 3260d9dfe85..10a35940490 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/UpdateExperimentsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/UpdateExperimentsOperation.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.ethz.sis.openbis.generic.asapi.v3.dto.experiment.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/UpdateExperimentsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/UpdateExperimentsOperationResult.java
index 59c60618d2c..eb5ca5b3867 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/UpdateExperimentsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/UpdateExperimentsOperationResult.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.ethz.sis.openbis.generic.asapi.v3.dto.experiment.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/ExternalDms.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/ExternalDms.java
index 8435e48b878..99b5334b6c6 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/ExternalDms.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/ExternalDms.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/ExternalDmsAddressType.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/ExternalDmsAddressType.java
index 3fe9b92a8b9..0e2f1b68d90 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/ExternalDmsAddressType.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/ExternalDmsAddressType.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.asapi.v3.dto.externaldms;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/create/CreateExternalDmsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/create/CreateExternalDmsOperation.java
index 127a35a16ce..b9f10f6625a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/create/CreateExternalDmsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/create/CreateExternalDmsOperation.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.asapi.v3.dto.externaldms.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/create/CreateExternalDmsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/create/CreateExternalDmsOperationResult.java
index 8a66ad6e6e0..8c69961ded0 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/create/CreateExternalDmsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/create/CreateExternalDmsOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.externaldms.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/create/ExternalDmsCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/create/ExternalDmsCreation.java
index f9a450dc05d..1a8878a6673 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/create/ExternalDmsCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/create/ExternalDmsCreation.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.asapi.v3.dto.externaldms.create;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/delete/DeleteExternalDmsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/delete/DeleteExternalDmsOperation.java
index 726db98443d..4a6e88232a1 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/delete/DeleteExternalDmsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/delete/DeleteExternalDmsOperation.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.asapi.v3.dto.externaldms.delete;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/delete/DeleteExternalDmsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/delete/DeleteExternalDmsOperationResult.java
index 9cd2d32facc..a2b92d86417 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/delete/DeleteExternalDmsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/delete/DeleteExternalDmsOperationResult.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.ethz.sis.openbis.generic.asapi.v3.dto.externaldms.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.delete.DeleteObjectsWithoutTrashOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/delete/ExternalDmsDeletionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/delete/ExternalDmsDeletionOptions.java
index d4e1db22464..3cc177ac04c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/delete/ExternalDmsDeletionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/delete/ExternalDmsDeletionOptions.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.asapi.v3.dto.externaldms.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.AbstractObjectDeletionOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/fetchoptions/ExternalDmsFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/fetchoptions/ExternalDmsFetchOptions.java
index c6afcf05330..487ead25b68 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/fetchoptions/ExternalDmsFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/fetchoptions/ExternalDmsFetchOptions.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/fetchoptions/ExternalDmsSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/fetchoptions/ExternalDmsSortOptions.java
index 4dd00438d09..9ddbf9db7c7 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/fetchoptions/ExternalDmsSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/fetchoptions/ExternalDmsSortOptions.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.asapi.v3.dto.externaldms.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/get/GetExternalDmsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/get/GetExternalDmsOperation.java
index 2793e152968..b5ce80f12e6 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/get/GetExternalDmsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/get/GetExternalDmsOperation.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.asapi.v3.dto.externaldms.get;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/get/GetExternalDmsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/get/GetExternalDmsOperationResult.java
index ead10990686..feff5ead78c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/get/GetExternalDmsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/get/GetExternalDmsOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.externaldms.get;
 
 import java.util.Map;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/id/ExternalDmsPermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/id/ExternalDmsPermId.java
index 63fbd1b7b84..5c0e4d888f9 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/id/ExternalDmsPermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/id/ExternalDmsPermId.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.asapi.v3.dto.externaldms.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectPermId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/id/IExternalDmsId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/id/IExternalDmsId.java
index 55aa81fe4e9..21e422e9152 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/id/IExternalDmsId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/id/IExternalDmsId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.externaldms.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/search/AddressSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/search/AddressSearchCriteria.java
index 3e5e20bb12d..4dec7b88a50 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/search/AddressSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/search/AddressSearchCriteria.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.asapi.v3.dto.externaldms.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/search/ExternalDmsSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/search/ExternalDmsSearchCriteria.java
index a7f459a8bc1..f5a34aa0d93 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/search/ExternalDmsSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/search/ExternalDmsSearchCriteria.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.asapi.v3.dto.externaldms.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/search/ExternalDmsTypeSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/search/ExternalDmsTypeSearchCriteria.java
index 77418c194f5..63e9ae12422 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/search/ExternalDmsTypeSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/search/ExternalDmsTypeSearchCriteria.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.asapi.v3.dto.externaldms.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.EnumFieldSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/search/LabelSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/search/LabelSearchCriteria.java
index ffeb0c1d5c5..e5cd37f129c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/search/LabelSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/search/LabelSearchCriteria.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.asapi.v3.dto.externaldms.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/search/SearchExternalDmsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/search/SearchExternalDmsOperation.java
index ac4974f6d40..afaf2e62ec1 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/search/SearchExternalDmsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/search/SearchExternalDmsOperation.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.asapi.v3.dto.externaldms.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/search/SearchExternalDmsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/search/SearchExternalDmsOperationResult.java
index a4f43f2da3f..20fd485257a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/search/SearchExternalDmsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/search/SearchExternalDmsOperationResult.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.asapi.v3.dto.externaldms.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/update/ExternalDmsUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/update/ExternalDmsUpdate.java
index baaf5b63024..bb04755625f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/update/ExternalDmsUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/update/ExternalDmsUpdate.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.asapi.v3.dto.externaldms.update;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/update/UpdateExternalDmsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/update/UpdateExternalDmsOperation.java
index e5f10c79bc5..41928c8d172 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/update/UpdateExternalDmsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/update/UpdateExternalDmsOperation.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.asapi.v3.dto.externaldms.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/update/UpdateExternalDmsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/update/UpdateExternalDmsOperationResult.java
index dc5714f8dc1..e54a3ec7260 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/update/UpdateExternalDmsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/externaldms/update/UpdateExternalDmsOperationResult.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.asapi.v3.dto.externaldms.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/GlobalSearchObject.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/GlobalSearchObject.java
index 0d3c6219ccb..49183d73e38 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/GlobalSearchObject.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/GlobalSearchObject.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/fetchoptions/GlobalSearchObjectFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/fetchoptions/GlobalSearchObjectFetchOptions.java
index 0bad997d3dd..d0fe8b74020 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/fetchoptions/GlobalSearchObjectFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/fetchoptions/GlobalSearchObjectFetchOptions.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/fetchoptions/GlobalSearchObjectSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/fetchoptions/GlobalSearchObjectSortOptions.java
index 8bbaa3e424b..a30ed0a280e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/fetchoptions/GlobalSearchObjectSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/fetchoptions/GlobalSearchObjectSortOptions.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.asapi.v3.dto.global.fetchoptions;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/fetchoptions/MatchFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/fetchoptions/MatchFetchOptions.java
index 0c9818a27ba..dab55f4db25 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/fetchoptions/MatchFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/fetchoptions/MatchFetchOptions.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.asapi.v3.dto.global.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.EmptyFetchOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/GlobalSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/GlobalSearchCriteria.java
index dee40680210..28b04ac7235 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/GlobalSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/GlobalSearchCriteria.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.asapi.v3.dto.global.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractCompositeSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/GlobalSearchObjectKind.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/GlobalSearchObjectKind.java
index 27837606c32..143ff477e12 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/GlobalSearchObjectKind.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/GlobalSearchObjectKind.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.asapi.v3.dto.global.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/GlobalSearchObjectKindCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/GlobalSearchObjectKindCriteria.java
index 0d1020b6033..fe9f8651bbb 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/GlobalSearchObjectKindCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/GlobalSearchObjectKindCriteria.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.asapi.v3.dto.global.search;
 
 import java.util.Arrays;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/GlobalSearchTextCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/GlobalSearchTextCriteria.java
index eae26f44fa2..022475a90bd 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/GlobalSearchTextCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/GlobalSearchTextCriteria.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.asapi.v3.dto.global.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.*;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/GlobalSearchWildCardsCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/GlobalSearchWildCardsCriteria.java
index b039cf361bb..86944a0b756 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/GlobalSearchWildCardsCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/GlobalSearchWildCardsCriteria.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.asapi.v3.dto.global.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/SearchGloballyOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/SearchGloballyOperation.java
index 427576ffb45..0705be31d3d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/SearchGloballyOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/SearchGloballyOperation.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.asapi.v3.dto.global.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/SearchGloballyOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/SearchGloballyOperationResult.java
index e2aec24ea26..0feb3a68b07 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/SearchGloballyOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/global/search/SearchGloballyOperationResult.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.asapi.v3.dto.global.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/ContentCopyHistoryEntry.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/ContentCopyHistoryEntry.java
index 30733746068..a5433d4c792 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/ContentCopyHistoryEntry.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/ContentCopyHistoryEntry.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.asapi.v3.dto.history;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/HistoryEntry.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/HistoryEntry.java
index 63a03f70cd5..3d94aa51346 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/HistoryEntry.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/HistoryEntry.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/IRelationType.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/IRelationType.java
index dad78c74a60..9651b2f8252 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/IRelationType.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/IRelationType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.history;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/PropertyHistoryEntry.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/PropertyHistoryEntry.java
index ee61fd66d49..63c05875d55 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/PropertyHistoryEntry.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/PropertyHistoryEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.history;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/RelationHistoryEntry.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/RelationHistoryEntry.java
index 8db01514ed5..a8819d8d4b3 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/RelationHistoryEntry.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/RelationHistoryEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.history;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/fetchoptions/HistoryEntryFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/fetchoptions/HistoryEntryFetchOptions.java
index 20ff3fc870c..cf2fdc4320b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/fetchoptions/HistoryEntryFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/fetchoptions/HistoryEntryFetchOptions.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/fetchoptions/HistoryEntrySortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/fetchoptions/HistoryEntrySortOptions.java
index d21cd89f80c..736a69d2025 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/fetchoptions/HistoryEntrySortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/fetchoptions/HistoryEntrySortOptions.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.asapi.v3.dto.history.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/id/UnknownRelatedObjectId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/id/UnknownRelatedObjectId.java
index 325fffbbc3e..a0a5c2ef245 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/id/UnknownRelatedObjectId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/history/id/UnknownRelatedObjectId.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.asapi.v3.dto.history.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/Material.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/Material.java
index 1d694a38b8b..2b5db212617 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/Material.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/Material.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/MaterialType.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/MaterialType.java
index 9f6cd5baf1a..3826907e74e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/MaterialType.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/MaterialType.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/CreateMaterialTypesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/CreateMaterialTypesOperation.java
index fc310cac244..01e433cde22 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/CreateMaterialTypesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/CreateMaterialTypesOperation.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.asapi.v3.dto.material.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/CreateMaterialTypesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/CreateMaterialTypesOperationResult.java
index 13bdf3843d7..55adea9f5f4 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/CreateMaterialTypesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/CreateMaterialTypesOperationResult.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.asapi.v3.dto.material.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/CreateMaterialsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/CreateMaterialsOperation.java
index 5a7bd940781..532bce4127f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/CreateMaterialsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/CreateMaterialsOperation.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.asapi.v3.dto.material.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/CreateMaterialsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/CreateMaterialsOperationResult.java
index 8b7583ca774..323e635f521 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/CreateMaterialsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/CreateMaterialsOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.material.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/MaterialCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/MaterialCreation.java
index 60a99c2f7d0..2dec4e6f2d7 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/MaterialCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/MaterialCreation.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.asapi.v3.dto.material.create;
 
 import java.util.HashMap;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/MaterialTypeCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/MaterialTypeCreation.java
index c4111552024..2efc16df57f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/MaterialTypeCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/MaterialTypeCreation.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.asapi.v3.dto.material.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/delete/DeleteMaterialTypesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/delete/DeleteMaterialTypesOperation.java
index 0ecfed5dc76..1c52eb27282 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/delete/DeleteMaterialTypesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/delete/DeleteMaterialTypesOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.material.delete;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/delete/DeleteMaterialTypesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/delete/DeleteMaterialTypesOperationResult.java
index c94ea9ec161..129048d4c91 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/delete/DeleteMaterialTypesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/delete/DeleteMaterialTypesOperationResult.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.asapi.v3.dto.material.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.delete.DeleteObjectsWithoutTrashOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/delete/DeleteMaterialsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/delete/DeleteMaterialsOperation.java
index 993cba7f97e..0e0a0b07b8e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/delete/DeleteMaterialsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/delete/DeleteMaterialsOperation.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.asapi.v3.dto.material.delete;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/delete/DeleteMaterialsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/delete/DeleteMaterialsOperationResult.java
index ba89f55cb7d..274c14682e3 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/delete/DeleteMaterialsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/delete/DeleteMaterialsOperationResult.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.ethz.sis.openbis.generic.asapi.v3.dto.material.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.delete.DeleteObjectsWithoutTrashOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/delete/MaterialDeletionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/delete/MaterialDeletionOptions.java
index 9c95a84b960..44f0f07725a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/delete/MaterialDeletionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/delete/MaterialDeletionOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.material.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.AbstractObjectDeletionOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/delete/MaterialTypeDeletionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/delete/MaterialTypeDeletionOptions.java
index eeaaf5c2a14..b92996ceee7 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/delete/MaterialTypeDeletionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/delete/MaterialTypeDeletionOptions.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.asapi.v3.dto.material.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.AbstractObjectDeletionOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialFetchOptions.java
index ad9418130ca..0bfabbafcd8 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialFetchOptions.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialSortOptions.java
index d29f9c6cf9b..3b702ea8a4b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialSortOptions.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.asapi.v3.dto.material.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.EntityWithPropertiesSortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialTypeFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialTypeFetchOptions.java
index 937c43d9169..62913019c94 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialTypeFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialTypeFetchOptions.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialTypeSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialTypeSortOptions.java
index fce3f3e6ccb..2ae951e4a39 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialTypeSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/fetchoptions/MaterialTypeSortOptions.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.asapi.v3.dto.material.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/get/GetMaterialTypesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/get/GetMaterialTypesOperation.java
index bff18d19607..1b3cdac2296 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/get/GetMaterialTypesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/get/GetMaterialTypesOperation.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.asapi.v3.dto.material.get;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/get/GetMaterialTypesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/get/GetMaterialTypesOperationResult.java
index 848476a3123..34a8587dad2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/get/GetMaterialTypesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/get/GetMaterialTypesOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.material.get;
 
 import java.util.Map;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/get/GetMaterialsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/get/GetMaterialsOperation.java
index 0098b6461a7..a354c224e85 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/get/GetMaterialsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/get/GetMaterialsOperation.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.asapi.v3.dto.material.get;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/get/GetMaterialsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/get/GetMaterialsOperationResult.java
index 2e3fdb44ce7..5e1bfb424e1 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/get/GetMaterialsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/get/GetMaterialsOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.material.get;
 
 import java.util.Map;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/id/IMaterialId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/id/IMaterialId.java
index 9fd79443456..958f80653ed 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/id/IMaterialId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/id/IMaterialId.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.ethz.sis.openbis.generic.asapi.v3.dto.material.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/id/MaterialPermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/id/MaterialPermId.java
index 0d5bf609a1b..9f508dffd7a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/id/MaterialPermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/id/MaterialPermId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.material.id;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/MaterialSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/MaterialSearchCriteria.java
index 28b9e835b90..26ee81cbe98 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/MaterialSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/MaterialSearchCriteria.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.asapi.v3.dto.material.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractEntitySearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/MaterialTypeSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/MaterialTypeSearchCriteria.java
index 853d30f9c52..3c41813ebfc 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/MaterialTypeSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/MaterialTypeSearchCriteria.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.asapi.v3.dto.material.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchCriteriaToStringBuilder;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/SearchMaterialTypesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/SearchMaterialTypesOperation.java
index a5249e55dd4..002810fded2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/SearchMaterialTypesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/SearchMaterialTypesOperation.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.asapi.v3.dto.material.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/SearchMaterialTypesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/SearchMaterialTypesOperationResult.java
index 482f85fb162..7a17f9925d3 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/SearchMaterialTypesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/SearchMaterialTypesOperationResult.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.asapi.v3.dto.material.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/SearchMaterialsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/SearchMaterialsOperation.java
index d208a21a9f3..9e7680ccdf3 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/SearchMaterialsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/SearchMaterialsOperation.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.asapi.v3.dto.material.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/SearchMaterialsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/SearchMaterialsOperationResult.java
index 30d929bdcd3..a1ee0f54938 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/SearchMaterialsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/search/SearchMaterialsOperationResult.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.asapi.v3.dto.material.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/MaterialTypeUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/MaterialTypeUpdate.java
index f4148ef346e..b2982844454 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/MaterialTypeUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/MaterialTypeUpdate.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.asapi.v3.dto.material.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/MaterialUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/MaterialUpdate.java
index 14db13b6ed9..3e01139031e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/MaterialUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/MaterialUpdate.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.asapi.v3.dto.material.update;
 
 import java.util.HashMap;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/UpdateMaterialTypesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/UpdateMaterialTypesOperation.java
index 33e792f78f0..f25f6181c0e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/UpdateMaterialTypesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/UpdateMaterialTypesOperation.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.asapi.v3.dto.material.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/UpdateMaterialTypesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/UpdateMaterialTypesOperationResult.java
index 9d773fdbf0f..a1cf65d70ec 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/UpdateMaterialTypesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/UpdateMaterialTypesOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.material.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/UpdateMaterialsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/UpdateMaterialsOperation.java
index f2782321873..3d31125a2d2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/UpdateMaterialsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/UpdateMaterialsOperation.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.asapi.v3.dto.material.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/UpdateMaterialsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/UpdateMaterialsOperationResult.java
index 0aab9fbf91c..00757a1534c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/UpdateMaterialsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/UpdateMaterialsOperationResult.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.asapi.v3.dto.material.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/ObjectKind.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/ObjectKind.java
index 16ccfab25e2..dbe79b6e44a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/ObjectKind.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/ObjectKind.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.asapi.v3.dto.objectkindmodification;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/ObjectKindModification.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/ObjectKindModification.java
index 4cc1752a88b..d7536ba9b3b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/ObjectKindModification.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/ObjectKindModification.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/OperationKind.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/OperationKind.java
index 5f6717a9241..e068ddf8dbe 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/OperationKind.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/OperationKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.asapi.v3.dto.objectkindmodification;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/fetchoptions/ObjectKindModificationFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/fetchoptions/ObjectKindModificationFetchOptions.java
index 1e392e19f02..42bbaaf2824 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/fetchoptions/ObjectKindModificationFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/fetchoptions/ObjectKindModificationFetchOptions.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/fetchoptions/ObjectKindModificationSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/fetchoptions/ObjectKindModificationSortOptions.java
index 69975e19378..7955e84a4ac 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/fetchoptions/ObjectKindModificationSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/fetchoptions/ObjectKindModificationSortOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.asapi.v3.dto.objectkindmodification.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/search/ObjectKindCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/search/ObjectKindCriteria.java
index 3b3f73f4a49..5287cf390ce 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/search/ObjectKindCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/search/ObjectKindCriteria.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.asapi.v3.dto.objectkindmodification.search;
 
 import java.util.Arrays;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/search/ObjectKindModificationSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/search/ObjectKindModificationSearchCriteria.java
index e2d3d6ce903..e9b5f734663 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/search/ObjectKindModificationSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/search/ObjectKindModificationSearchCriteria.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.asapi.v3.dto.objectkindmodification.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractCompositeSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/search/OperationKindCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/search/OperationKindCriteria.java
index 99b2d495145..ae893064592 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/search/OperationKindCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/search/OperationKindCriteria.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.asapi.v3.dto.objectkindmodification.search;
 
 import java.util.Arrays;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/search/SearchObjectKindModificationsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/search/SearchObjectKindModificationsOperation.java
index 8aae14e6c34..cab1a7e17ac 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/search/SearchObjectKindModificationsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/search/SearchObjectKindModificationsOperation.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.asapi.v3.dto.objectkindmodification.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/search/SearchObjectKindModificationsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/search/SearchObjectKindModificationsOperationResult.java
index 88b661b90c7..cedc2798aaf 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/search/SearchObjectKindModificationsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/objectkindmodification/search/SearchObjectKindModificationsOperationResult.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.asapi.v3.dto.objectkindmodification.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/AbstractOperationExecutionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/AbstractOperationExecutionOptions.java
index 8867caee44d..156456f3c00 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/AbstractOperationExecutionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/AbstractOperationExecutionOptions.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.asapi.v3.dto.operation;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/AsynchronousOperationExecutionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/AsynchronousOperationExecutionOptions.java
index 28193cf93fc..eb67d622ab5 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/AsynchronousOperationExecutionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/AsynchronousOperationExecutionOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.operation;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/AsynchronousOperationExecutionResults.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/AsynchronousOperationExecutionResults.java
index 96ed83a4b31..c46735327e4 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/AsynchronousOperationExecutionResults.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/AsynchronousOperationExecutionResults.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.asapi.v3.dto.operation;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/IOperationExecutionNotification.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/IOperationExecutionNotification.java
index f65c8481223..664cd94a654 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/IOperationExecutionNotification.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/IOperationExecutionNotification.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.asapi.v3.dto.operation;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/IOperationExecutionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/IOperationExecutionOptions.java
index 9bef5d41730..e04b39ff510 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/IOperationExecutionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/IOperationExecutionOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.operation;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/IOperationExecutionResults.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/IOperationExecutionResults.java
index d312032400d..101900b8485 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/IOperationExecutionResults.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/IOperationExecutionResults.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.operation;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecution.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecution.java
index 230fcf92bb2..7793869abe5 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecution.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecution.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecutionAvailability.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecutionAvailability.java
index c9f2200f5c8..6dea1ddeb9a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecutionAvailability.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecutionAvailability.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.asapi.v3.dto.operation;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecutionDetails.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecutionDetails.java
index 65231fe8e14..6ee5d2c8806 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecutionDetails.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecutionDetails.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecutionEmailNotification.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecutionEmailNotification.java
index e6cdb86092f..07b66256148 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecutionEmailNotification.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecutionEmailNotification.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.asapi.v3.dto.operation;
 
 import java.util.Arrays;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecutionError.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecutionError.java
index 59688fb093c..8d5d72d2a65 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecutionError.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecutionError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.operation;
 
 import java.io.PrintWriter;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecutionProgress.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecutionProgress.java
index 1c33f911f16..3751849dbd6 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecutionProgress.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecutionProgress.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.asapi.v3.dto.operation;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecutionState.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecutionState.java
index b4ebb2db2c3..814f7d1e230 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecutionState.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/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.ethz.sis.openbis.generic.asapi.v3.dto.operation;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecutionSummary.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecutionSummary.java
index 45c7ba6e001..b306de9f66c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecutionSummary.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/OperationExecutionSummary.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/SynchronousOperationExecutionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/SynchronousOperationExecutionOptions.java
index edf000281b9..3ed9b2c7e6b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/SynchronousOperationExecutionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/SynchronousOperationExecutionOptions.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.asapi.v3.dto.operation;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.operation.id.OperationExecutionPermId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/SynchronousOperationExecutionResults.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/SynchronousOperationExecutionResults.java
index f26956d303d..a0883804795 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/SynchronousOperationExecutionResults.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/SynchronousOperationExecutionResults.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.operation;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/delete/DeleteOperationExecutionsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/delete/DeleteOperationExecutionsOperation.java
index f334748705b..ac5d5c3829a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/delete/DeleteOperationExecutionsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/delete/DeleteOperationExecutionsOperation.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.asapi.v3.dto.operation.delete;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/delete/DeleteOperationExecutionsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/delete/DeleteOperationExecutionsOperationResult.java
index 42b6baf15fa..91b73a2eb45 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/delete/DeleteOperationExecutionsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/delete/DeleteOperationExecutionsOperationResult.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.ethz.sis.openbis.generic.asapi.v3.dto.operation.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.delete.DeleteObjectsWithoutTrashOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/delete/OperationExecutionDeletionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/delete/OperationExecutionDeletionOptions.java
index 4ee62ec881d..27540866cdb 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/delete/OperationExecutionDeletionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/delete/OperationExecutionDeletionOptions.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.asapi.v3.dto.operation.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.AbstractObjectDeletionOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionDetailsFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionDetailsFetchOptions.java
index d75a7710e71..0e37afc3b80 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionDetailsFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionDetailsFetchOptions.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionDetailsSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionDetailsSortOptions.java
index 4d965b59f06..2ae340490db 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionDetailsSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionDetailsSortOptions.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.asapi.v3.dto.operation.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionFetchOptions.java
index 2dbaf30059e..2d5a8f67182 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionFetchOptions.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionNotificationFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionNotificationFetchOptions.java
index 213de71edfb..3f9f007087a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionNotificationFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionNotificationFetchOptions.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.asapi.v3.dto.operation.fetchoptions;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionNotificationSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionNotificationSortOptions.java
index 3c8751381be..ea27f15933f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionNotificationSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionNotificationSortOptions.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.asapi.v3.dto.operation.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionSortOptions.java
index 63893a251c9..9dcd12617d2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionSortOptions.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.asapi.v3.dto.operation.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionSummaryFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionSummaryFetchOptions.java
index 3c5fdd57f3b..d2e78daf060 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionSummaryFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionSummaryFetchOptions.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionSummarySortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionSummarySortOptions.java
index 90a0566be44..edbc09fc65e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionSummarySortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/fetchoptions/OperationExecutionSummarySortOptions.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.asapi.v3.dto.operation.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/get/GetOperationExecutionsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/get/GetOperationExecutionsOperation.java
index cf3a7f498cd..5c91c96a063 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/get/GetOperationExecutionsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/get/GetOperationExecutionsOperation.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.asapi.v3.dto.operation.get;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/get/GetOperationExecutionsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/get/GetOperationExecutionsOperationResult.java
index 1ff232ec8dc..5bb5eceedfd 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/get/GetOperationExecutionsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/get/GetOperationExecutionsOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.operation.get;
 
 import java.util.Map;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/id/IOperationExecutionId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/id/IOperationExecutionId.java
index 4e89b38fd02..2acf246a552 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/id/IOperationExecutionId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/id/IOperationExecutionId.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.asapi.v3.dto.operation.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/id/OperationExecutionPermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/id/OperationExecutionPermId.java
index 76de96de318..e0b18ec9789 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/id/OperationExecutionPermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/id/OperationExecutionPermId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.operation.id;
 
 import java.util.UUID;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/search/OperationExecutionSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/search/OperationExecutionSearchCriteria.java
index e9256310b93..c092cfddcce 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/search/OperationExecutionSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/search/OperationExecutionSearchCriteria.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.asapi.v3.dto.operation.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractCompositeSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/search/SearchOperationExecutionsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/search/SearchOperationExecutionsOperation.java
index ddc4fd11a40..19032b2ad66 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/search/SearchOperationExecutionsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/search/SearchOperationExecutionsOperation.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.asapi.v3.dto.operation.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/search/SearchOperationExecutionsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/search/SearchOperationExecutionsOperationResult.java
index d0a35ab542d..1425ef3cf1f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/search/SearchOperationExecutionsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/search/SearchOperationExecutionsOperationResult.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.asapi.v3.dto.operation.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/update/OperationExecutionUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/update/OperationExecutionUpdate.java
index eb9925fcdae..34c7fc38929 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/update/OperationExecutionUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/update/OperationExecutionUpdate.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.asapi.v3.dto.operation.update;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/update/UpdateOperationExecutionsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/update/UpdateOperationExecutionsOperation.java
index 21c1f57d369..223e24a83ed 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/update/UpdateOperationExecutionsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/update/UpdateOperationExecutionsOperation.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.asapi.v3.dto.operation.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/update/UpdateOperationExecutionsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/update/UpdateOperationExecutionsOperationResult.java
index a264658895b..7ddbd5f3710 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/update/UpdateOperationExecutionsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/operation/update/UpdateOperationExecutionsOperationResult.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.asapi.v3.dto.operation.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/PersonalAccessToken.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/PersonalAccessToken.java
index a5b5dc65668..b9d4bada756 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/PersonalAccessToken.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/PersonalAccessToken.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/create/CreatePersonalAccessTokensOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/create/CreatePersonalAccessTokensOperation.java
index 9e11499a658..e46db436aa5 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/create/CreatePersonalAccessTokensOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/create/CreatePersonalAccessTokensOperation.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.asapi.v3.dto.pat.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/create/CreatePersonalAccessTokensOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/create/CreatePersonalAccessTokensOperationResult.java
index 1a7493d69bf..81dfbcb7044 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/create/CreatePersonalAccessTokensOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/create/CreatePersonalAccessTokensOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.pat.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/create/PersonalAccessTokenCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/create/PersonalAccessTokenCreation.java
index 78a3c5f872f..df66761a653 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/create/PersonalAccessTokenCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/create/PersonalAccessTokenCreation.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.asapi.v3.dto.pat.create;
 
 import java.util.Date;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/delete/DeletePersonalAccessTokensOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/delete/DeletePersonalAccessTokensOperation.java
index ef16ccea159..827be8f337f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/delete/DeletePersonalAccessTokensOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/delete/DeletePersonalAccessTokensOperation.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.asapi.v3.dto.pat.delete;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/delete/DeletePersonalAccessTokensOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/delete/DeletePersonalAccessTokensOperationResult.java
index a161febc3ba..ce4426cb3b1 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/delete/DeletePersonalAccessTokensOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/delete/DeletePersonalAccessTokensOperationResult.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.ethz.sis.openbis.generic.asapi.v3.dto.pat.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.delete.DeleteObjectsWithoutTrashOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/delete/PersonalAccessTokenDeletionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/delete/PersonalAccessTokenDeletionOptions.java
index 5fb71989b17..5587a044cd4 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/delete/PersonalAccessTokenDeletionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/delete/PersonalAccessTokenDeletionOptions.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.asapi.v3.dto.pat.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.AbstractObjectDeletionOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/fetchoptions/PersonalAccessTokenFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/fetchoptions/PersonalAccessTokenFetchOptions.java
index 0898645c3ae..26c36e5d096 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/fetchoptions/PersonalAccessTokenFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/fetchoptions/PersonalAccessTokenFetchOptions.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/fetchoptions/PersonalAccessTokenSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/fetchoptions/PersonalAccessTokenSortOptions.java
index 45846094386..791759950e1 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/fetchoptions/PersonalAccessTokenSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/fetchoptions/PersonalAccessTokenSortOptions.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.asapi.v3.dto.pat.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/get/GetPersonalAccessTokensOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/get/GetPersonalAccessTokensOperation.java
index bf6e456176a..682fcc315c0 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/get/GetPersonalAccessTokensOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/get/GetPersonalAccessTokensOperation.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.asapi.v3.dto.pat.get;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/get/GetPersonalAccessTokensOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/get/GetPersonalAccessTokensOperationResult.java
index 2b3080d6cd1..ff4235d1f08 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/get/GetPersonalAccessTokensOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/get/GetPersonalAccessTokensOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.pat.get;
 
 import java.util.Map;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/id/IPersonalAccessTokenId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/id/IPersonalAccessTokenId.java
index 806488ece5a..9fa131b6d3c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/id/IPersonalAccessTokenId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/id/IPersonalAccessTokenId.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.asapi.v3.dto.pat.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/id/PersonalAccessTokenPermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/id/PersonalAccessTokenPermId.java
index 5029c118c24..f1eaec2c273 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/id/PersonalAccessTokenPermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/id/PersonalAccessTokenPermId.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.asapi.v3.dto.pat.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectPermId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/search/PersonalAccessTokenOwnerSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/search/PersonalAccessTokenOwnerSearchCriteria.java
index 9d3d0625b64..d30a47d0720 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/search/PersonalAccessTokenOwnerSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/search/PersonalAccessTokenOwnerSearchCriteria.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.asapi.v3.dto.pat.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchCriteriaToStringBuilder;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/search/PersonalAccessTokenSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/search/PersonalAccessTokenSearchCriteria.java
index 6aa5390a54b..72613579717 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/search/PersonalAccessTokenSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/search/PersonalAccessTokenSearchCriteria.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.asapi.v3.dto.pat.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractObjectSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/search/PersonalAccessTokenSessionNameSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/search/PersonalAccessTokenSessionNameSearchCriteria.java
index b7d3fa47215..dd5146bdaea 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/search/PersonalAccessTokenSessionNameSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/search/PersonalAccessTokenSessionNameSearchCriteria.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.asapi.v3.dto.pat.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/search/SearchPersonalAccessTokensOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/search/SearchPersonalAccessTokensOperation.java
index 59e50782b64..6e179e5fcdd 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/search/SearchPersonalAccessTokensOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/search/SearchPersonalAccessTokensOperation.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.asapi.v3.dto.pat.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/search/SearchPersonalAccessTokensOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/search/SearchPersonalAccessTokensOperationResult.java
index 4372738c614..2d1e2fdda0c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/search/SearchPersonalAccessTokensOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/search/SearchPersonalAccessTokensOperationResult.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.asapi.v3.dto.pat.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/update/PersonalAccessTokenUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/update/PersonalAccessTokenUpdate.java
index 47ea6ae4f57..adce26f6271 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/update/PersonalAccessTokenUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/update/PersonalAccessTokenUpdate.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.asapi.v3.dto.pat.update;
 
 import java.util.Date;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/update/UpdatePersonalAccessTokensOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/update/UpdatePersonalAccessTokensOperation.java
index 2bcf3404e1b..c82800c9efe 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/update/UpdatePersonalAccessTokensOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/update/UpdatePersonalAccessTokensOperation.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.asapi.v3.dto.pat.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/update/UpdatePersonalAccessTokensOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/update/UpdatePersonalAccessTokensOperationResult.java
index 0bb8d0bc236..465222c6194 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/update/UpdatePersonalAccessTokensOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/pat/update/UpdatePersonalAccessTokensOperationResult.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.asapi.v3.dto.pat.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/Person.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/Person.java
index f74df4085c6..2c58f61153e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/Person.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/Person.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/create/CreatePersonsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/create/CreatePersonsOperation.java
index 2c6c5df53f0..4ff187c6668 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/create/CreatePersonsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/create/CreatePersonsOperation.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.asapi.v3.dto.person.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/create/CreatePersonsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/create/CreatePersonsOperationResult.java
index 598dce4d873..f7eaaa8abdc 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/create/CreatePersonsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/create/CreatePersonsOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.person.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/create/PersonCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/create/PersonCreation.java
index fcc46905dbc..7c559db6e98 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/create/PersonCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/create/PersonCreation.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.asapi.v3.dto.person.create;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/delete/DeletePersonsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/delete/DeletePersonsOperation.java
index 29696b8c850..1ff29a8b4d6 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/delete/DeletePersonsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/delete/DeletePersonsOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.person.delete;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/delete/DeletePersonsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/delete/DeletePersonsOperationResult.java
index 0f8f04f23a5..4931e337df6 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/delete/DeletePersonsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/delete/DeletePersonsOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.person.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.delete.DeleteObjectsWithoutTrashOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/delete/PersonDeletionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/delete/PersonDeletionOptions.java
index 75993fe4a51..9af61851896 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/delete/PersonDeletionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/delete/PersonDeletionOptions.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.asapi.v3.dto.person.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.AbstractObjectDeletionOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/fetchoptions/PersonFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/fetchoptions/PersonFetchOptions.java
index 986a42d63d5..4f56a246a02 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/fetchoptions/PersonFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/fetchoptions/PersonFetchOptions.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/fetchoptions/PersonFetchOptionsAllWebAppSettingsHandler.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/fetchoptions/PersonFetchOptionsAllWebAppSettingsHandler.java
index 6d67af2bb86..24595b120cf 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/fetchoptions/PersonFetchOptionsAllWebAppSettingsHandler.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/fetchoptions/PersonFetchOptionsAllWebAppSettingsHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.person.fetchoptions;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/fetchoptions/PersonFetchOptionsWebAppSettingsHandler.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/fetchoptions/PersonFetchOptionsWebAppSettingsHandler.java
index 256c570536b..76f1b05a03a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/fetchoptions/PersonFetchOptionsWebAppSettingsHandler.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/fetchoptions/PersonFetchOptionsWebAppSettingsHandler.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.asapi.v3.dto.person.fetchoptions;
 
 import java.util.Map;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/fetchoptions/PersonSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/fetchoptions/PersonSortOptions.java
index ce26ef90866..8939a8c4448 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/fetchoptions/PersonSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/fetchoptions/PersonSortOptions.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.asapi.v3.dto.person.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/get/GetPersonsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/get/GetPersonsOperation.java
index c8bf785214b..a0d723811e8 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/get/GetPersonsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/get/GetPersonsOperation.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.asapi.v3.dto.person.get;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/get/GetPersonsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/get/GetPersonsOperationResult.java
index 0442865247b..c3aa9c02f26 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/get/GetPersonsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/get/GetPersonsOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.person.get;
 
 import java.util.Map;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/id/IPersonId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/id/IPersonId.java
index 7433d9d67cd..014cbe7dd78 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/id/IPersonId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/id/IPersonId.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.ethz.sis.openbis.generic.asapi.v3.dto.person.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/id/Me.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/id/Me.java
index a57e908ce6a..90cbd29a2db 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/id/Me.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/id/Me.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.asapi.v3.dto.person.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectPermId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/id/PersonPermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/id/PersonPermId.java
index 8d1332e88ec..a3c2ea1bb38 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/id/PersonPermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/id/PersonPermId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.person.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectPermId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/EmailSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/EmailSearchCriteria.java
index e5a87997cd1..8b72aeb2003 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/EmailSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/EmailSearchCriteria.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.asapi.v3.dto.person.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/FirstNameSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/FirstNameSearchCriteria.java
index a4c712658b3..5141f05c02f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/FirstNameSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/FirstNameSearchCriteria.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.asapi.v3.dto.person.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/LastNameSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/LastNameSearchCriteria.java
index 7c4e7ed26e4..6cc04d27da6 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/LastNameSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/LastNameSearchCriteria.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.asapi.v3.dto.person.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/ModifierSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/ModifierSearchCriteria.java
index 18df428d92a..6996d300a5e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/ModifierSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/ModifierSearchCriteria.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.asapi.v3.dto.person.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchCriteriaToStringBuilder;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/PersonSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/PersonSearchCriteria.java
index d05f06f50be..efb9969220f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/PersonSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/PersonSearchCriteria.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.asapi.v3.dto.person.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractObjectSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/RegistratorSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/RegistratorSearchCriteria.java
index a07d4c22a36..f4d822ed0d6 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/RegistratorSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/RegistratorSearchCriteria.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.asapi.v3.dto.person.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchCriteriaToStringBuilder;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/SearchPersonsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/SearchPersonsOperation.java
index c20daff88fa..419798abd92 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/SearchPersonsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/SearchPersonsOperation.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.asapi.v3.dto.person.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/SearchPersonsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/SearchPersonsOperationResult.java
index af8deb71444..a2ec307fa95 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/SearchPersonsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/SearchPersonsOperationResult.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.asapi.v3.dto.person.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/UserIdSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/UserIdSearchCriteria.java
index 34854c3b0ce..496a93f5fb2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/UserIdSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/UserIdSearchCriteria.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.asapi.v3.dto.person.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/UserIdsSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/UserIdsSearchCriteria.java
index f4518fe531c..90df126c583 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/UserIdsSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/search/UserIdsSearchCriteria.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.asapi.v3.dto.person.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.CollectionFieldSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/update/PersonUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/update/PersonUpdate.java
index 3c743b6ec67..49b237e0003 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/update/PersonUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/update/PersonUpdate.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.asapi.v3.dto.person.update;
 
 import java.util.HashMap;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/update/UpdatePersonsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/update/UpdatePersonsOperation.java
index 7da6b7aceb6..079f21f81c7 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/update/UpdatePersonsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/update/UpdatePersonsOperation.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.asapi.v3.dto.person.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/update/UpdatePersonsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/update/UpdatePersonsOperationResult.java
index 295e3b83fdd..00e4e015f3c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/update/UpdatePersonsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/person/update/UpdatePersonsOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.person.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/Plugin.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/Plugin.java
index 8fa1f5e98af..8d252ad532f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/Plugin.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/Plugin.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.asapi.v3.dto.plugin;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/PluginKind.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/PluginKind.java
index 40d23e00239..6026813d06d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/PluginKind.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/PluginKind.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.asapi.v3.dto.plugin;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/PluginType.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/PluginType.java
index 09dd8374a82..1f648884de4 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/PluginType.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/PluginType.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.asapi.v3.dto.plugin;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/create/CreatePluginsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/create/CreatePluginsOperation.java
index f203418af4d..bc027da8eee 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/create/CreatePluginsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/create/CreatePluginsOperation.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.asapi.v3.dto.plugin.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/create/CreatePluginsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/create/CreatePluginsOperationResult.java
index 4adcf816f0d..09075bb5598 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/create/CreatePluginsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/create/CreatePluginsOperationResult.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.asapi.v3.dto.plugin.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/create/PluginCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/create/PluginCreation.java
index 43fd13d3e02..a03478e652a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/create/PluginCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/create/PluginCreation.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.asapi.v3.dto.plugin.create;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/delete/DeletePluginsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/delete/DeletePluginsOperation.java
index 8d77be3a164..865595a984e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/delete/DeletePluginsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/delete/DeletePluginsOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.plugin.delete;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/delete/DeletePluginsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/delete/DeletePluginsOperationResult.java
index 002364044bb..b295e2a4a76 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/delete/DeletePluginsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/delete/DeletePluginsOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.plugin.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.delete.DeleteObjectsWithoutTrashOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/delete/PluginDeletionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/delete/PluginDeletionOptions.java
index 9f9551f6058..89bc3bf084a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/delete/PluginDeletionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/delete/PluginDeletionOptions.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.asapi.v3.dto.plugin.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.AbstractObjectDeletionOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/DynamicPropertyPluginEvaluationOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/DynamicPropertyPluginEvaluationOptions.java
index 70ef12b8f42..e8dcd54e033 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/DynamicPropertyPluginEvaluationOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/DynamicPropertyPluginEvaluationOptions.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.asapi.v3.dto.plugin.evaluate;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/DynamicPropertyPluginEvaluationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/DynamicPropertyPluginEvaluationResult.java
index 9ccd5ac6175..02102f31d3c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/DynamicPropertyPluginEvaluationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/DynamicPropertyPluginEvaluationResult.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.asapi.v3.dto.plugin.evaluate;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/EntityValidationPluginEvaluationOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/EntityValidationPluginEvaluationOptions.java
index da002128c4c..c3d95c0faaa 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/EntityValidationPluginEvaluationOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/EntityValidationPluginEvaluationOptions.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.asapi.v3.dto.plugin.evaluate;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/EntityValidationPluginEvaluationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/EntityValidationPluginEvaluationResult.java
index 42ca8acd3c3..f06be367ad6 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/EntityValidationPluginEvaluationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/EntityValidationPluginEvaluationResult.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.asapi.v3.dto.plugin.evaluate;
 
 import java.util.Collection;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/EvaluatePluginOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/EvaluatePluginOperation.java
index 28ffc51afe4..cddaab39e95 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/EvaluatePluginOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/EvaluatePluginOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.plugin.evaluate;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/EvaluatePluginOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/EvaluatePluginOperationResult.java
index 10b2641af56..74a05c3a3a4 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/EvaluatePluginOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/EvaluatePluginOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.plugin.evaluate;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/PluginEvaluationOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/PluginEvaluationOptions.java
index 6793ba234dc..88105e8b48a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/PluginEvaluationOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/PluginEvaluationOptions.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.asapi.v3.dto.plugin.evaluate;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/PluginEvaluationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/PluginEvaluationResult.java
index 0fd3d21fd33..d2b7c5386ba 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/PluginEvaluationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/evaluate/PluginEvaluationResult.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.asapi.v3.dto.plugin.evaluate;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/fetchoptions/PluginFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/fetchoptions/PluginFetchOptions.java
index e2945f653a9..e0ad6cfe94d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/fetchoptions/PluginFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/fetchoptions/PluginFetchOptions.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.asapi.v3.dto.plugin.fetchoptions;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/fetchoptions/PluginSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/fetchoptions/PluginSortOptions.java
index 6b1640dd43f..b2208178d72 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/fetchoptions/PluginSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/fetchoptions/PluginSortOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.plugin.fetchoptions;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/get/GetPluginsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/get/GetPluginsOperation.java
index 1201f554229..0768afccba7 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/get/GetPluginsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/get/GetPluginsOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.plugin.get;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/get/GetPluginsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/get/GetPluginsOperationResult.java
index cc6a0457b1c..b349a87cef1 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/get/GetPluginsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/get/GetPluginsOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.plugin.get;
 
 import java.util.Map;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/id/IPluginId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/id/IPluginId.java
index 6e9429a1a67..e750d760c04 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/id/IPluginId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/id/IPluginId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.plugin.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/id/PluginPermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/id/PluginPermId.java
index 63713c338fe..5d6d6a2d25b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/id/PluginPermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/id/PluginPermId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.plugin.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectPermId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/search/PluginKindSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/search/PluginKindSearchCriteria.java
index 252bc5cc4a8..f49aec28af2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/search/PluginKindSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/search/PluginKindSearchCriteria.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.asapi.v3.dto.plugin.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.EnumFieldSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/search/PluginSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/search/PluginSearchCriteria.java
index 9c13ca0169a..551a3341bb7 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/search/PluginSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/search/PluginSearchCriteria.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.plugin.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractObjectSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/search/PluginTypeSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/search/PluginTypeSearchCriteria.java
index f25c45b6cba..e6c750b3ae7 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/search/PluginTypeSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/search/PluginTypeSearchCriteria.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.asapi.v3.dto.plugin.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.EnumFieldSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/search/SearchPluginsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/search/SearchPluginsOperation.java
index 91cf5aab771..e7c78b62343 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/search/SearchPluginsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/search/SearchPluginsOperation.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.asapi.v3.dto.plugin.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/search/SearchPluginsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/search/SearchPluginsOperationResult.java
index 0ab9f990d0d..2995fc530df 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/search/SearchPluginsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/search/SearchPluginsOperationResult.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.asapi.v3.dto.plugin.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/update/PluginUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/update/PluginUpdate.java
index 3bae2d74f3f..07f778bfc12 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/update/PluginUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/update/PluginUpdate.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.asapi.v3.dto.plugin.update;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/update/UpdatePluginsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/update/UpdatePluginsOperation.java
index f08bc5a82ef..7d576505ea3 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/update/UpdatePluginsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/update/UpdatePluginsOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.plugin.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/update/UpdatePluginsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/update/UpdatePluginsOperationResult.java
index 37758df643a..6313eee478c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/update/UpdatePluginsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/plugin/update/UpdatePluginsOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.plugin.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/Project.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/Project.java
index d0161af42e8..2829a0f8754 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/Project.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/Project.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/create/CreateProjectsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/create/CreateProjectsOperation.java
index 90fabf9bb21..a59eabf405e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/create/CreateProjectsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/create/CreateProjectsOperation.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.asapi.v3.dto.project.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/create/CreateProjectsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/create/CreateProjectsOperationResult.java
index e19d6f0660c..422d77ce7b5 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/create/CreateProjectsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/create/CreateProjectsOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.project.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/create/ProjectCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/create/ProjectCreation.java
index c828748aaad..99825fcf3f5 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/create/ProjectCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/create/ProjectCreation.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.asapi.v3.dto.project.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/delete/DeleteProjectsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/delete/DeleteProjectsOperation.java
index c0c7882a465..7016a924d3a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/delete/DeleteProjectsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/delete/DeleteProjectsOperation.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.asapi.v3.dto.project.delete;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/delete/DeleteProjectsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/delete/DeleteProjectsOperationResult.java
index 502d667e0e5..5dc874f394b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/delete/DeleteProjectsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/delete/DeleteProjectsOperationResult.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.asapi.v3.dto.project.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.delete.DeleteObjectsWithoutTrashOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/delete/ProjectDeletionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/delete/ProjectDeletionOptions.java
index bd88c3f3936..bd39d57bf6c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/delete/ProjectDeletionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/delete/ProjectDeletionOptions.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.asapi.v3.dto.project.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.AbstractObjectDeletionOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/fetchoptions/ProjectFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/fetchoptions/ProjectFetchOptions.java
index 15aae845c08..f2e94c67b41 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/fetchoptions/ProjectFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/fetchoptions/ProjectFetchOptions.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/fetchoptions/ProjectSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/fetchoptions/ProjectSortOptions.java
index 1bba3c263e9..4e951a1bad9 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/fetchoptions/ProjectSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/fetchoptions/ProjectSortOptions.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.asapi.v3.dto.project.fetchoptions;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/get/GetProjectsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/get/GetProjectsOperation.java
index 7b722c027de..1c33d8ddda4 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/get/GetProjectsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/get/GetProjectsOperation.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.asapi.v3.dto.project.get;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/get/GetProjectsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/get/GetProjectsOperationResult.java
index b34efedffc3..439394a2351 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/get/GetProjectsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/get/GetProjectsOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.project.get;
 
 import java.util.Map;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/history/ProjectRelationType.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/history/ProjectRelationType.java
index 9bdbe04faf2..cdb5711db1c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/history/ProjectRelationType.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/history/ProjectRelationType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.project.history;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.history.IRelationType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/id/IProjectId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/id/IProjectId.java
index 3e5ff774079..fdcb0bc345f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/id/IProjectId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/id/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.ethz.sis.openbis.generic.asapi.v3.dto.project.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/id/ProjectIdentifier.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/id/ProjectIdentifier.java
index 5a0f1673cc4..36f50214593 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/id/ProjectIdentifier.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/id/ProjectIdentifier.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.asapi.v3.dto.project.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectIdentifier;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/id/ProjectPermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/id/ProjectPermId.java
index 3060a7ee83d..cb08926729c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/id/ProjectPermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/id/ProjectPermId.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.asapi.v3.dto.project.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectPermId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/search/NoProjectSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/search/NoProjectSearchCriteria.java
index fd51df35e31..07e45a61589 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/search/NoProjectSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/search/NoProjectSearchCriteria.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.project.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/search/ProjectSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/search/ProjectSearchCriteria.java
index 9a3dc6e3238..1d6ed6f4816 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/search/ProjectSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/search/ProjectSearchCriteria.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.asapi.v3.dto.project.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractObjectSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/search/SearchProjectsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/search/SearchProjectsOperation.java
index c96f1e6f586..a9d8de93fb0 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/search/SearchProjectsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/search/SearchProjectsOperation.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.asapi.v3.dto.project.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/search/SearchProjectsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/search/SearchProjectsOperationResult.java
index 73b0c916b21..07363a5e8db 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/search/SearchProjectsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/search/SearchProjectsOperationResult.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.asapi.v3.dto.project.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/update/ProjectUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/update/ProjectUpdate.java
index 5a941a533cf..47b0413d06b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/update/ProjectUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/update/ProjectUpdate.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.asapi.v3.dto.project.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/update/UpdateProjectsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/update/UpdateProjectsOperation.java
index 80ca5b091c4..16c43e077be 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/update/UpdateProjectsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/update/UpdateProjectsOperation.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.asapi.v3.dto.project.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/update/UpdateProjectsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/update/UpdateProjectsOperationResult.java
index 1cd8e9a241c..05389357797 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/update/UpdateProjectsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/project/update/UpdateProjectsOperationResult.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.asapi.v3.dto.project.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/DataType.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/DataType.java
index 6ed2a26da03..7984d23cf1b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/DataType.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/DataType.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.asapi.v3.dto.property;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/PropertyAssignment.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/PropertyAssignment.java
index 92fd9e2a24f..ec2aa4a26e4 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/PropertyAssignment.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/PropertyAssignment.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/PropertyType.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/PropertyType.java
index 891017978fd..ef0ca49f8ac 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/PropertyType.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/PropertyType.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/create/CreatePropertyTypesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/create/CreatePropertyTypesOperation.java
index 4d8b4851ec1..57e6487d2aa 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/create/CreatePropertyTypesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/create/CreatePropertyTypesOperation.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.asapi.v3.dto.property.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/create/CreatePropertyTypesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/create/CreatePropertyTypesOperationResult.java
index c22a4001c60..b132f1335f7 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/create/CreatePropertyTypesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/create/CreatePropertyTypesOperationResult.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.asapi.v3.dto.property.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/create/PropertyAssignmentCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/create/PropertyAssignmentCreation.java
index 9b30f557e79..cc8607686db 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/create/PropertyAssignmentCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/create/PropertyAssignmentCreation.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.asapi.v3.dto.property.create;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/create/PropertyTypeCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/create/PropertyTypeCreation.java
index 9c6a32019ad..513be9ba368 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/create/PropertyTypeCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/create/PropertyTypeCreation.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.asapi.v3.dto.property.create;
 
 import java.util.Map;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/delete/DeletePropertyTypesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/delete/DeletePropertyTypesOperation.java
index a3800cf8068..ada50689dd6 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/delete/DeletePropertyTypesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/delete/DeletePropertyTypesOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.property.delete;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/delete/DeletePropertyTypesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/delete/DeletePropertyTypesOperationResult.java
index 62481eff077..22ce52252d9 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/delete/DeletePropertyTypesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/delete/DeletePropertyTypesOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.property.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.delete.DeleteObjectsWithoutTrashOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/delete/PropertyTypeDeletionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/delete/PropertyTypeDeletionOptions.java
index 6bae4d47faa..10976245e8c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/delete/PropertyTypeDeletionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/delete/PropertyTypeDeletionOptions.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.asapi.v3.dto.property.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.AbstractObjectDeletionOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/fetchoptions/PropertyAssignmentFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/fetchoptions/PropertyAssignmentFetchOptions.java
index f0a962d1d9b..104cbc440c9 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/fetchoptions/PropertyAssignmentFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/fetchoptions/PropertyAssignmentFetchOptions.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/fetchoptions/PropertyAssignmentSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/fetchoptions/PropertyAssignmentSortOptions.java
index 650e9c07708..ba85f92fa27 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/fetchoptions/PropertyAssignmentSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/fetchoptions/PropertyAssignmentSortOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.asapi.v3.dto.property.fetchoptions;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/fetchoptions/PropertyFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/fetchoptions/PropertyFetchOptions.java
index 7ec94dfdf99..5e7dac782d7 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/fetchoptions/PropertyFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/fetchoptions/PropertyFetchOptions.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.ethz.sis.openbis.generic.asapi.v3.dto.property.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.EmptyFetchOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/fetchoptions/PropertyTypeFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/fetchoptions/PropertyTypeFetchOptions.java
index 94224bea44c..09cdcd2e917 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/fetchoptions/PropertyTypeFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/fetchoptions/PropertyTypeFetchOptions.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/fetchoptions/PropertyTypeSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/fetchoptions/PropertyTypeSortOptions.java
index 5ae893b55b3..6478ca0030f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/fetchoptions/PropertyTypeSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/fetchoptions/PropertyTypeSortOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 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.asapi.v3.dto.property.fetchoptions;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/get/GetPropertyTypesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/get/GetPropertyTypesOperation.java
index 6e9b12fc22e..3f73eebf074 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/get/GetPropertyTypesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/get/GetPropertyTypesOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.property.get;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/get/GetPropertyTypesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/get/GetPropertyTypesOperationResult.java
index 5aed23d9b32..7f9885662f6 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/get/GetPropertyTypesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/get/GetPropertyTypesOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.property.get;
 
 import java.util.Map;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/id/IPropertyAssignmentId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/id/IPropertyAssignmentId.java
index f82925cd7b0..80817c7f6c0 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/id/IPropertyAssignmentId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/id/IPropertyAssignmentId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/id/IPropertyTypeId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/id/IPropertyTypeId.java
index 10402689d67..2ced2acb1d8 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/id/IPropertyTypeId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/id/IPropertyTypeId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.property.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/id/PropertyAssignmentPermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/id/PropertyAssignmentPermId.java
index 2527fe4cbd2..7cf83a3cda0 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/id/PropertyAssignmentPermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/id/PropertyAssignmentPermId.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.asapi.v3.dto.property.id;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/id/PropertyTypePermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/id/PropertyTypePermId.java
index c4ce9dac6e8..81053f2da31 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/id/PropertyTypePermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/id/PropertyTypePermId.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.asapi.v3.dto.property.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectPermId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/search/PropertyAssignmentSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/search/PropertyAssignmentSearchCriteria.java
index e6138f73385..b7307e6cfd2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/search/PropertyAssignmentSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/search/PropertyAssignmentSearchCriteria.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.asapi.v3.dto.property.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractObjectSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/search/PropertyTypeSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/search/PropertyTypeSearchCriteria.java
index 82a11d29326..394e943db3b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/search/PropertyTypeSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/search/PropertyTypeSearchCriteria.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.asapi.v3.dto.property.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractObjectSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/search/SearchPropertyAssignmentsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/search/SearchPropertyAssignmentsOperation.java
index 2d408845014..5a59f7cbba2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/search/SearchPropertyAssignmentsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/search/SearchPropertyAssignmentsOperation.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.asapi.v3.dto.property.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/search/SearchPropertyAssignmentsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/search/SearchPropertyAssignmentsOperationResult.java
index 2bd8daccf85..91097765d51 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/search/SearchPropertyAssignmentsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/search/SearchPropertyAssignmentsOperationResult.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.asapi.v3.dto.property.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/search/SearchPropertyTypesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/search/SearchPropertyTypesOperation.java
index 1ac87dd654d..6c84cab3f47 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/search/SearchPropertyTypesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/search/SearchPropertyTypesOperation.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.asapi.v3.dto.property.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/search/SearchPropertyTypesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/search/SearchPropertyTypesOperationResult.java
index b0477f441a2..925b1afbe71 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/search/SearchPropertyTypesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/search/SearchPropertyTypesOperationResult.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.asapi.v3.dto.property.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/update/PropertyTypeUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/update/PropertyTypeUpdate.java
index c86ca975296..4d6fdbb1214 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/update/PropertyTypeUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/update/PropertyTypeUpdate.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.asapi.v3.dto.property.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/update/UpdatePropertyTypesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/update/UpdatePropertyTypesOperation.java
index eb365c81e2f..5c5ea7609bd 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/update/UpdatePropertyTypesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/update/UpdatePropertyTypesOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.property.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/update/UpdatePropertyTypesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/update/UpdatePropertyTypesOperationResult.java
index 398cd9768d5..0527227b143 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/update/UpdatePropertyTypesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/property/update/UpdatePropertyTypesOperationResult.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.asapi.v3.dto.property.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/Query.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/Query.java
index df2332a1cad..fac10b301df 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/Query.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/Query.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/QueryDatabase.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/QueryDatabase.java
index 98e30272c20..a245535883e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/QueryDatabase.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/QueryDatabase.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/QueryType.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/QueryType.java
index 9ed32bbbedb..f9ef8f57394 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/QueryType.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/QueryType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.query;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/create/CreateQueriesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/create/CreateQueriesOperation.java
index 752456fd9a4..a43e61ef2a3 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/create/CreateQueriesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/create/CreateQueriesOperation.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.asapi.v3.dto.query.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/create/CreateQueriesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/create/CreateQueriesOperationResult.java
index fdf3119de2f..87a2cfdabc0 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/create/CreateQueriesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/create/CreateQueriesOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.query.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/create/QueryCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/create/QueryCreation.java
index f9ebe36e96e..6b987d22040 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/create/QueryCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/create/QueryCreation.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.asapi.v3.dto.query.create;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/delete/DeleteQueriesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/delete/DeleteQueriesOperation.java
index 54773a00bc0..f50f9dff75d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/delete/DeleteQueriesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/delete/DeleteQueriesOperation.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.asapi.v3.dto.query.delete;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/delete/DeleteQueriesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/delete/DeleteQueriesOperationResult.java
index 9966a266ef5..67133bf64e6 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/delete/DeleteQueriesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/delete/DeleteQueriesOperationResult.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.ethz.sis.openbis.generic.asapi.v3.dto.query.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.delete.DeleteObjectsWithoutTrashOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/delete/QueryDeletionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/delete/QueryDeletionOptions.java
index afcc5656612..b8e87211c5c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/delete/QueryDeletionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/delete/QueryDeletionOptions.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.asapi.v3.dto.query.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.AbstractObjectDeletionOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/execute/ExecuteQueryOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/execute/ExecuteQueryOperation.java
index 570236bab9a..7a6dc71266b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/execute/ExecuteQueryOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/execute/ExecuteQueryOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.query.execute;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/execute/ExecuteQueryOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/execute/ExecuteQueryOperationResult.java
index 5bd8270ea70..da85670563f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/execute/ExecuteQueryOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/execute/ExecuteQueryOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.query.execute;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.TableModel;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/execute/ExecuteSqlOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/execute/ExecuteSqlOperation.java
index b5fa5029db7..8765d48f553 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/execute/ExecuteSqlOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/execute/ExecuteSqlOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.query.execute;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/execute/ExecuteSqlOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/execute/ExecuteSqlOperationResult.java
index a550b7d5bf9..6f83cece25f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/execute/ExecuteSqlOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/execute/ExecuteSqlOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.query.execute;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.TableModel;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/execute/QueryExecutionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/execute/QueryExecutionOptions.java
index 167e5d46825..f325cef6370 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/execute/QueryExecutionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/execute/QueryExecutionOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.query.execute;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/execute/SqlExecutionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/execute/SqlExecutionOptions.java
index 670e6047231..9f286f48722 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/execute/SqlExecutionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/execute/SqlExecutionOptions.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.asapi.v3.dto.query.execute;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/fetchoptions/QueryDatabaseFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/fetchoptions/QueryDatabaseFetchOptions.java
index 82dce0a6323..26a52869a19 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/fetchoptions/QueryDatabaseFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/fetchoptions/QueryDatabaseFetchOptions.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/fetchoptions/QueryDatabaseSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/fetchoptions/QueryDatabaseSortOptions.java
index 438a2d78b7f..cd05c0214d5 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/fetchoptions/QueryDatabaseSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/fetchoptions/QueryDatabaseSortOptions.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.asapi.v3.dto.query.fetchoptions;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/fetchoptions/QueryFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/fetchoptions/QueryFetchOptions.java
index 521a10a8eda..20c1670dbd7 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/fetchoptions/QueryFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/fetchoptions/QueryFetchOptions.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/fetchoptions/QuerySortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/fetchoptions/QuerySortOptions.java
index aedbdd0e40d..c2f2c6edecc 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/fetchoptions/QuerySortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/fetchoptions/QuerySortOptions.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.asapi.v3.dto.query.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/get/GetQueriesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/get/GetQueriesOperation.java
index d99121d5b48..b0375bf5644 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/get/GetQueriesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/get/GetQueriesOperation.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.asapi.v3.dto.query.get;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/get/GetQueriesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/get/GetQueriesOperationResult.java
index 0b7bc2975b3..edbd961c017 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/get/GetQueriesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/get/GetQueriesOperationResult.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.asapi.v3.dto.query.get;
 
 import java.util.Map;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/get/GetQueryDatabasesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/get/GetQueryDatabasesOperation.java
index 11d546950d4..95cb9f38089 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/get/GetQueryDatabasesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/get/GetQueryDatabasesOperation.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.asapi.v3.dto.query.get;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/get/GetQueryDatabasesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/get/GetQueryDatabasesOperationResult.java
index b57658bac85..effe55614fa 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/get/GetQueryDatabasesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/get/GetQueryDatabasesOperationResult.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.asapi.v3.dto.query.get;
 
 import java.util.Map;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/id/IQueryDatabaseId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/id/IQueryDatabaseId.java
index b030e49f220..41e76494a89 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/id/IQueryDatabaseId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/id/IQueryDatabaseId.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.asapi.v3.dto.query.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/id/IQueryId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/id/IQueryId.java
index df9add010ce..2ccf4cdf22a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/id/IQueryId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/id/IQueryId.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.asapi.v3.dto.query.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/id/QueryDatabaseName.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/id/QueryDatabaseName.java
index 72a8586a756..9b587b8376c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/id/QueryDatabaseName.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/id/QueryDatabaseName.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.ethz.sis.openbis.generic.asapi.v3.dto.query.id;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/id/QueryName.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/id/QueryName.java
index 9ac52e1d075..5047d97de8b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/id/QueryName.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/id/QueryName.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.ethz.sis.openbis.generic.asapi.v3.dto.query.id;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/id/QueryTechId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/id/QueryTechId.java
index 0787cabfaa1..8052c7bbac8 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/id/QueryTechId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/id/QueryTechId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.query.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectTechId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/DatabaseIdSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/DatabaseIdSearchCriteria.java
index a543e22a8d3..8fbbfb8c860 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/DatabaseIdSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/DatabaseIdSearchCriteria.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.asapi.v3.dto.query.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.IdSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/EntityTypeCodePatternSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/EntityTypeCodePatternSearchCriteria.java
index f6f2b58d89a..c0d30c9fd4b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/EntityTypeCodePatternSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/EntityTypeCodePatternSearchCriteria.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.asapi.v3.dto.query.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/QueryDatabaseSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/QueryDatabaseSearchCriteria.java
index 61dd5b7049a..62b432b4e05 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/QueryDatabaseSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/QueryDatabaseSearchCriteria.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.asapi.v3.dto.query.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractObjectSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/QuerySearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/QuerySearchCriteria.java
index 70374871962..8634c0fb0a3 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/QuerySearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/QuerySearchCriteria.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.query.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractObjectSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/QueryTypeSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/QueryTypeSearchCriteria.java
index 30eafffad1f..60fcd38bcb6 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/QueryTypeSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/QueryTypeSearchCriteria.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.asapi.v3.dto.query.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.EnumFieldSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/SearchQueriesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/SearchQueriesOperation.java
index 9aca24a7dfd..c255cb7c36c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/SearchQueriesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/SearchQueriesOperation.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.asapi.v3.dto.query.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/SearchQueriesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/SearchQueriesOperationResult.java
index b5a7cae4e49..0c36ab968ee 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/SearchQueriesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/SearchQueriesOperationResult.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.asapi.v3.dto.query.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/SearchQueryDatabasesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/SearchQueryDatabasesOperation.java
index 88644304afa..560c040cba9 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/SearchQueryDatabasesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/SearchQueryDatabasesOperation.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.asapi.v3.dto.query.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/SearchQueryDatabasesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/SearchQueryDatabasesOperationResult.java
index 2c7f96f4206..1d0005700f2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/SearchQueryDatabasesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/SearchQueryDatabasesOperationResult.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.asapi.v3.dto.query.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/SqlSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/SqlSearchCriteria.java
index 7150ac0a8d8..bf5bb847560 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/SqlSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/search/SqlSearchCriteria.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.asapi.v3.dto.query.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/update/QueryUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/update/QueryUpdate.java
index e509465c988..06d8f034a3a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/update/QueryUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/update/QueryUpdate.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.asapi.v3.dto.query.update;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/update/UpdateQueriesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/update/UpdateQueriesOperation.java
index 8549547492a..2da48c61f9b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/update/UpdateQueriesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/update/UpdateQueriesOperation.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.asapi.v3.dto.query.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/update/UpdateQueriesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/update/UpdateQueriesOperationResult.java
index 8ac380074b0..bf00d357bf0 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/update/UpdateQueriesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/query/update/UpdateQueriesOperationResult.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.asapi.v3.dto.query.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/rights/Right.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/rights/Right.java
index 8cfed57fa11..38ff3e0807a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/rights/Right.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/rights/Right.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.asapi.v3.dto.rights;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/rights/Rights.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/rights/Rights.java
index 14e612b7ac8..3df967c9069 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/rights/Rights.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/rights/Rights.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 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.asapi.v3.dto.rights;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/rights/fetchoptions/RightsFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/rights/fetchoptions/RightsFetchOptions.java
index 952d1abd691..9638614d0a6 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/rights/fetchoptions/RightsFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/rights/fetchoptions/RightsFetchOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 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.asapi.v3.dto.rights.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.EmptyFetchOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/rights/get/GetRightsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/rights/get/GetRightsOperation.java
index c7049d1e333..fd294d1b1f2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/rights/get/GetRightsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/rights/get/GetRightsOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 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.asapi.v3.dto.rights.get;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/rights/get/GetRightsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/rights/get/GetRightsOperationResult.java
index 2e3bc7b0d9f..75f7d545350 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/rights/get/GetRightsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/rights/get/GetRightsOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.rights.get;
 
 import java.util.Map;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/Role.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/Role.java
index 82dcbe673cb..b8d13567148 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/Role.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/Role.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.asapi.v3.dto.roleassignment;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/RoleAssignment.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/RoleAssignment.java
index 414b23f4e66..0b39c795b4f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/RoleAssignment.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/RoleAssignment.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.asapi.v3.dto.roleassignment;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/RoleLevel.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/RoleLevel.java
index 748156690b7..9a06431dc4a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/RoleLevel.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/RoleLevel.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.asapi.v3.dto.roleassignment;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/create/CreateRoleAssignmentsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/create/CreateRoleAssignmentsOperation.java
index 057d400fb01..5a59a1d022d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/create/CreateRoleAssignmentsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/create/CreateRoleAssignmentsOperation.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.asapi.v3.dto.roleassignment.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/create/CreateRoleAssignmentsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/create/CreateRoleAssignmentsOperationResult.java
index 5e74ce8b1f5..212c2298d33 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/create/CreateRoleAssignmentsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/create/CreateRoleAssignmentsOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.roleassignment.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/create/RoleAssignmentCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/create/RoleAssignmentCreation.java
index ffc9599d95e..d4a2f7df2de 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/create/RoleAssignmentCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/create/RoleAssignmentCreation.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.asapi.v3.dto.roleassignment.create;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/delete/DeleteRoleAssignmentsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/delete/DeleteRoleAssignmentsOperation.java
index f728a12a57a..bd008b4f36b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/delete/DeleteRoleAssignmentsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/delete/DeleteRoleAssignmentsOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.roleassignment.delete;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/delete/DeleteRoleAssignmentsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/delete/DeleteRoleAssignmentsOperationResult.java
index a0c3fb5e227..2bb579c440f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/delete/DeleteRoleAssignmentsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/delete/DeleteRoleAssignmentsOperationResult.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.asapi.v3.dto.roleassignment.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.delete.DeleteObjectsWithoutTrashOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/delete/RoleAssignmentDeletionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/delete/RoleAssignmentDeletionOptions.java
index eb3ebe42312..d0e81409178 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/delete/RoleAssignmentDeletionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/delete/RoleAssignmentDeletionOptions.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.asapi.v3.dto.roleassignment.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.AbstractObjectDeletionOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/fetchoptions/RoleAssignmentFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/fetchoptions/RoleAssignmentFetchOptions.java
index 8c9e5e624a0..257d2815667 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/fetchoptions/RoleAssignmentFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/fetchoptions/RoleAssignmentFetchOptions.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.asapi.v3.dto.roleassignment.fetchoptions;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/fetchoptions/RoleAssignmentSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/fetchoptions/RoleAssignmentSortOptions.java
index e391b074995..75651156f09 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/fetchoptions/RoleAssignmentSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/fetchoptions/RoleAssignmentSortOptions.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.asapi.v3.dto.roleassignment.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/get/GetRoleAssignmentsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/get/GetRoleAssignmentsOperation.java
index 1ee62ebda47..91649a799b8 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/get/GetRoleAssignmentsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/get/GetRoleAssignmentsOperation.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.asapi.v3.dto.roleassignment.get;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/get/GetRoleAssignmentsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/get/GetRoleAssignmentsOperationResult.java
index 60615e16228..7c43db6822d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/get/GetRoleAssignmentsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/get/GetRoleAssignmentsOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.roleassignment.get;
 
 import java.util.Map;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/id/IRoleAssignmentId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/id/IRoleAssignmentId.java
index 2ae5e6b04e3..5d2cd3b558d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/id/IRoleAssignmentId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/id/IRoleAssignmentId.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.asapi.v3.dto.roleassignment.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/id/RoleAssignmentTechId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/id/RoleAssignmentTechId.java
index 4287226fabb..aba08e6f6ee 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/id/RoleAssignmentTechId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/id/RoleAssignmentTechId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.roleassignment.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectTechId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/search/RoleAssignmentSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/search/RoleAssignmentSearchCriteria.java
index 048a1358c71..9b1d9811d07 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/search/RoleAssignmentSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/search/RoleAssignmentSearchCriteria.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.asapi.v3.dto.roleassignment.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.authorizationgroup.search.AuthorizationGroupSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/search/SearchRoleAssignmentsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/search/SearchRoleAssignmentsOperation.java
index fc7d82c5751..d1b186ea9c1 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/search/SearchRoleAssignmentsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/search/SearchRoleAssignmentsOperation.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.asapi.v3.dto.roleassignment.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/search/SearchRoleAssignmentsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/search/SearchRoleAssignmentsOperationResult.java
index 7f827218a3a..549ce0809bf 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/search/SearchRoleAssignmentsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/roleassignment/search/SearchRoleAssignmentsOperationResult.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.asapi.v3.dto.roleassignment.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/Sample.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/Sample.java
index 1735148fd84..8f741a250a9 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/Sample.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/Sample.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/SampleType.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/SampleType.java
index e7b084cb7e0..a52bb94ab3f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/SampleType.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/SampleType.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSampleTypesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSampleTypesOperation.java
index 8e04fbfbf83..82319a60315 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSampleTypesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSampleTypesOperation.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.asapi.v3.dto.sample.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSampleTypesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSampleTypesOperationResult.java
index 14090dd9aed..713885ab15a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSampleTypesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSampleTypesOperationResult.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.asapi.v3.dto.sample.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSamplesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSamplesOperation.java
index e812da9c97a..6a9b95337bc 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSamplesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSamplesOperation.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.asapi.v3.dto.sample.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSamplesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSamplesOperationResult.java
index 1f83e43ba96..62b46fbc613 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSamplesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/CreateSamplesOperationResult.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.asapi.v3.dto.sample.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/SampleTypeCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/SampleTypeCreation.java
index 133e25b81e3..c1bbdc54064 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/SampleTypeCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/SampleTypeCreation.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.asapi.v3.dto.sample.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/delete/DeleteSampleTypesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/delete/DeleteSampleTypesOperation.java
index bd406df8da0..53738f865a3 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/delete/DeleteSampleTypesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/delete/DeleteSampleTypesOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.delete;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/delete/DeleteSampleTypesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/delete/DeleteSampleTypesOperationResult.java
index 29780e5f8cb..833da9e17aa 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/delete/DeleteSampleTypesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/delete/DeleteSampleTypesOperationResult.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.asapi.v3.dto.sample.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.delete.DeleteObjectsWithoutTrashOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/delete/DeleteSamplesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/delete/DeleteSamplesOperation.java
index 4245cfab46d..517c7816741 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/delete/DeleteSamplesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/delete/DeleteSamplesOperation.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.asapi.v3.dto.sample.delete;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/delete/DeleteSamplesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/delete/DeleteSamplesOperationResult.java
index ae914dc8a13..0dfad31067c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/delete/DeleteSamplesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/delete/DeleteSamplesOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.delete.DeleteObjectsWithTrashOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/delete/SampleDeletionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/delete/SampleDeletionOptions.java
index 4dc7989b9e1..5a3bdd1e637 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/delete/SampleDeletionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/delete/SampleDeletionOptions.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.asapi.v3.dto.sample.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.AbstractObjectDeletionOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/delete/SampleTypeDeletionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/delete/SampleTypeDeletionOptions.java
index 4cf831526ab..1a7fa3612c4 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/delete/SampleTypeDeletionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/delete/SampleTypeDeletionOptions.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.asapi.v3.dto.sample.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.AbstractObjectDeletionOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleFetchOptions.java
index a43d576c498..2076bcca10d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleFetchOptions.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleSortOptions.java
index 9c10736c0a9..0b82d95f0c9 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleSortOptions.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.asapi.v3.dto.sample.fetchoptions;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleTypeFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleTypeFetchOptions.java
index 0853ea2d56e..38c98bc00df 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleTypeFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleTypeFetchOptions.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleTypeSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleTypeSortOptions.java
index 5d6b3355909..19f90eba73d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleTypeSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/fetchoptions/SampleTypeSortOptions.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.asapi.v3.dto.sample.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/get/GetSampleTypesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/get/GetSampleTypesOperation.java
index 3c43340978d..0e9dc950aec 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/get/GetSampleTypesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/get/GetSampleTypesOperation.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.asapi.v3.dto.sample.get;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/get/GetSampleTypesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/get/GetSampleTypesOperationResult.java
index 377294ef351..f3e5aa3b8d0 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/get/GetSampleTypesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/get/GetSampleTypesOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.get;
 
 import java.util.Map;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/get/GetSamplesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/get/GetSamplesOperation.java
index f777622df93..5c99375dac2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/get/GetSamplesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/get/GetSamplesOperation.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.asapi.v3.dto.sample.get;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/get/GetSamplesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/get/GetSamplesOperationResult.java
index 11482d44e43..139794d6ef3 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/get/GetSamplesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/get/GetSamplesOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.get;
 
 import java.util.Map;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/history/SampleRelationType.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/history/SampleRelationType.java
index 3e3f504f46c..f7ee4bdb16a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/history/SampleRelationType.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/history/SampleRelationType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.history;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.history.IRelationType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/id/ISampleId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/id/ISampleId.java
index b9a95885f0a..52090b2b921 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/id/ISampleId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/id/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.ethz.sis.openbis.generic.asapi.v3.dto.sample.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/id/SampleIdDeserializer.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/id/SampleIdDeserializer.java
index 451598cf76c..a6910ec5b24 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/id/SampleIdDeserializer.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/id/SampleIdDeserializer.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.asapi.v3.dto.sample.id;
 
 import java.io.IOException;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/id/SampleIdentifier.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/id/SampleIdentifier.java
index 37eef13b576..08317612210 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/id/SampleIdentifier.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/id/SampleIdentifier.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.asapi.v3.dto.sample.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectIdentifier;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/id/SamplePermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/id/SamplePermId.java
index 02f1dcb2100..5bc03be5b9e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/id/SamplePermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/id/SamplePermId.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.asapi.v3.dto.sample.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectPermId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/AbstractSampleSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/AbstractSampleSearchCriteria.java
index 1410bfefbcd..50c7f6a7e3b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/AbstractSampleSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/AbstractSampleSearchCriteria.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 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.asapi.v3.dto.sample.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractEntitySearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/ListableSampleTypeSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/ListableSampleTypeSearchCriteria.java
index 24077969c10..21324d151e1 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/ListableSampleTypeSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/ListableSampleTypeSearchCriteria.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.asapi.v3.dto.sample.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/NoSampleContainerSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/NoSampleContainerSearchCriteria.java
index 3e2369ee6f3..874ded6c33e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/NoSampleContainerSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/NoSampleContainerSearchCriteria.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/NoSampleSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/NoSampleSearchCriteria.java
index 2aeaafe900c..e112cfaad13 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/NoSampleSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/NoSampleSearchCriteria.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleChildrenSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleChildrenSearchCriteria.java
index 4c7d5ff735d..ecfb9e7289d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleChildrenSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleChildrenSearchCriteria.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.asapi.v3.dto.sample.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleContainerSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleContainerSearchCriteria.java
index e9dde6411ad..37534ad6eb9 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleContainerSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleContainerSearchCriteria.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.asapi.v3.dto.sample.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleParentsSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleParentsSearchCriteria.java
index 227e3d3157f..eb182404390 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleParentsSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleParentsSearchCriteria.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.asapi.v3.dto.sample.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleSearchCriteria.java
index 7ead4cb0340..87857ab35f5 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleSearchCriteria.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.asapi.v3.dto.sample.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.TextAttributeSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleSearchRelation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleSearchRelation.java
index bf32faa1beb..9b77b6e3856 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleSearchRelation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleSearchRelation.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.asapi.v3.dto.sample.search;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleTypeSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleTypeSearchCriteria.java
index 78b08533612..d66925f2b64 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleTypeSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SampleTypeSearchCriteria.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SearchSampleTypesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SearchSampleTypesOperation.java
index 221911c77c5..172fcd1e3eb 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SearchSampleTypesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SearchSampleTypesOperation.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.asapi.v3.dto.sample.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SearchSampleTypesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SearchSampleTypesOperationResult.java
index 837d553a0f5..75e280388d5 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SearchSampleTypesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SearchSampleTypesOperationResult.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.asapi.v3.dto.sample.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SearchSamplesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SearchSamplesOperation.java
index 2bf558edb7c..04db0ba8130 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SearchSamplesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SearchSamplesOperation.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.asapi.v3.dto.sample.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SearchSamplesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SearchSamplesOperationResult.java
index 8bd9bee03ab..cd9d1959e33 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SearchSamplesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/search/SearchSamplesOperationResult.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.asapi.v3.dto.sample.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/SampleTypeUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/SampleTypeUpdate.java
index 21069d6a1ac..9051aedf87e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/SampleTypeUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/SampleTypeUpdate.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.asapi.v3.dto.sample.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/SampleUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/SampleUpdate.java
index a45215d2b94..505a6689a3e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/SampleUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/SampleUpdate.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.asapi.v3.dto.sample.update;
 
 import java.util.HashMap;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/UpdateSampleTypesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/UpdateSampleTypesOperation.java
index 2831742b620..9b4d4999293 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/UpdateSampleTypesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/UpdateSampleTypesOperation.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.asapi.v3.dto.sample.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/UpdateSampleTypesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/UpdateSampleTypesOperationResult.java
index 9bfbcfa5287..aa9323f9a7f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/UpdateSampleTypesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/UpdateSampleTypesOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/UpdateSamplesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/UpdateSamplesOperation.java
index 06a43db871e..985bcd822d8 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/UpdateSamplesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/UpdateSamplesOperation.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.asapi.v3.dto.sample.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/UpdateSamplesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/UpdateSamplesOperationResult.java
index c0dec16fb7c..5a15d15bb74 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/UpdateSamplesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/UpdateSamplesOperationResult.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.asapi.v3.dto.sample.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/SemanticAnnotation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/SemanticAnnotation.java
index 68c2e55b43b..304d26cb26f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/SemanticAnnotation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/SemanticAnnotation.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/create/CreateSemanticAnnotationsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/create/CreateSemanticAnnotationsOperation.java
index a3de9028153..4f90554c19c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/create/CreateSemanticAnnotationsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/create/CreateSemanticAnnotationsOperation.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.asapi.v3.dto.semanticannotation.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/create/CreateSemanticAnnotationsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/create/CreateSemanticAnnotationsOperationResult.java
index 788a34c5f1d..682e9c88d49 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/create/CreateSemanticAnnotationsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/create/CreateSemanticAnnotationsOperationResult.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.ethz.sis.openbis.generic.asapi.v3.dto.semanticannotation.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/create/SemanticAnnotationCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/create/SemanticAnnotationCreation.java
index 2c7775716e9..9f51fb663f2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/create/SemanticAnnotationCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/create/SemanticAnnotationCreation.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.asapi.v3.dto.semanticannotation.create;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/delete/DeleteSemanticAnnotationsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/delete/DeleteSemanticAnnotationsOperation.java
index 4ae31152111..340cde80bc3 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/delete/DeleteSemanticAnnotationsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/delete/DeleteSemanticAnnotationsOperation.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.asapi.v3.dto.semanticannotation.delete;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/delete/DeleteSemanticAnnotationsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/delete/DeleteSemanticAnnotationsOperationResult.java
index e66df1b5a9a..edbfa4691f3 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/delete/DeleteSemanticAnnotationsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/delete/DeleteSemanticAnnotationsOperationResult.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.ethz.sis.openbis.generic.asapi.v3.dto.semanticannotation.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.delete.DeleteObjectsWithoutTrashOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/delete/SemanticAnnotationDeletionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/delete/SemanticAnnotationDeletionOptions.java
index 69842a67b34..9a099eb06da 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/delete/SemanticAnnotationDeletionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/delete/SemanticAnnotationDeletionOptions.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.asapi.v3.dto.semanticannotation.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.AbstractObjectDeletionOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/fetchoptions/SemanticAnnotationFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/fetchoptions/SemanticAnnotationFetchOptions.java
index 75cbe7d12b4..4b929872b85 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/fetchoptions/SemanticAnnotationFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/fetchoptions/SemanticAnnotationFetchOptions.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/fetchoptions/SemanticAnnotationSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/fetchoptions/SemanticAnnotationSortOptions.java
index 020a306ec4b..b86b69c46a6 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/fetchoptions/SemanticAnnotationSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/fetchoptions/SemanticAnnotationSortOptions.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.asapi.v3.dto.semanticannotation.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/get/GetSemanticAnnotationsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/get/GetSemanticAnnotationsOperation.java
index 3b8edba13f8..00201772ffd 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/get/GetSemanticAnnotationsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/get/GetSemanticAnnotationsOperation.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.asapi.v3.dto.semanticannotation.get;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/get/GetSemanticAnnotationsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/get/GetSemanticAnnotationsOperationResult.java
index 8f47c937026..e6f10e28f64 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/get/GetSemanticAnnotationsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/get/GetSemanticAnnotationsOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.semanticannotation.get;
 
 import java.util.Map;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/id/ISemanticAnnotationId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/id/ISemanticAnnotationId.java
index 7dc8bc9218f..38db4ee550c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/id/ISemanticAnnotationId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/id/ISemanticAnnotationId.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.ethz.sis.openbis.generic.asapi.v3.dto.semanticannotation.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/id/SemanticAnnotationPermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/id/SemanticAnnotationPermId.java
index 7073d32cbd7..27ea2d9a346 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/id/SemanticAnnotationPermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/id/SemanticAnnotationPermId.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.asapi.v3.dto.semanticannotation.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectPermId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/DescriptorAccessionIdSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/DescriptorAccessionIdSearchCriteria.java
index a2277301bd7..dead0e256e7 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/DescriptorAccessionIdSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/DescriptorAccessionIdSearchCriteria.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.asapi.v3.dto.semanticannotation.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/DescriptorOntologyIdSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/DescriptorOntologyIdSearchCriteria.java
index ffbef58a49a..9321c9189be 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/DescriptorOntologyIdSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/DescriptorOntologyIdSearchCriteria.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.asapi.v3.dto.semanticannotation.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/DescriptorOntologyVersionSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/DescriptorOntologyVersionSearchCriteria.java
index d54e914901c..a155efe20e3 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/DescriptorOntologyVersionSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/DescriptorOntologyVersionSearchCriteria.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.asapi.v3.dto.semanticannotation.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/PredicateAccessionIdSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/PredicateAccessionIdSearchCriteria.java
index d84408b564d..bceb6eba1df 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/PredicateAccessionIdSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/PredicateAccessionIdSearchCriteria.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.asapi.v3.dto.semanticannotation.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/PredicateOntologyIdSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/PredicateOntologyIdSearchCriteria.java
index fe4f27e1548..b26523d9eb3 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/PredicateOntologyIdSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/PredicateOntologyIdSearchCriteria.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.asapi.v3.dto.semanticannotation.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/PredicateOntologyVersionSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/PredicateOntologyVersionSearchCriteria.java
index 278affc7cdb..e2adc08b328 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/PredicateOntologyVersionSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/PredicateOntologyVersionSearchCriteria.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.asapi.v3.dto.semanticannotation.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/SearchSemanticAnnotationsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/SearchSemanticAnnotationsOperation.java
index f23e9064885..c7f5617955b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/SearchSemanticAnnotationsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/SearchSemanticAnnotationsOperation.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.asapi.v3.dto.semanticannotation.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/SearchSemanticAnnotationsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/SearchSemanticAnnotationsOperationResult.java
index 72aab52dcd9..75b49451ba1 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/SearchSemanticAnnotationsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/SearchSemanticAnnotationsOperationResult.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.asapi.v3.dto.semanticannotation.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/SemanticAnnotationSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/SemanticAnnotationSearchCriteria.java
index 166e37f354e..581c40f8145 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/SemanticAnnotationSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/search/SemanticAnnotationSearchCriteria.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.asapi.v3.dto.semanticannotation.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractObjectSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/update/SemanticAnnotationUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/update/SemanticAnnotationUpdate.java
index 8950e707a77..e2ebb75ca12 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/update/SemanticAnnotationUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/update/SemanticAnnotationUpdate.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.asapi.v3.dto.semanticannotation.update;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/update/UpdateSemanticAnnotationsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/update/UpdateSemanticAnnotationsOperation.java
index 3ac33a1cc75..0e5f3725db7 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/update/UpdateSemanticAnnotationsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/update/UpdateSemanticAnnotationsOperation.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.asapi.v3.dto.semanticannotation.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/update/UpdateSemanticAnnotationsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/update/UpdateSemanticAnnotationsOperationResult.java
index 35570a7d43c..e8e53d515ac 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/update/UpdateSemanticAnnotationsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/semanticannotation/update/UpdateSemanticAnnotationsOperationResult.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.asapi.v3.dto.semanticannotation.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/server/ServerInformation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/server/ServerInformation.java
index f7f30e15627..a2aedf6c82c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/server/ServerInformation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/server/ServerInformation.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.asapi.v3.dto.server;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/AggregationService.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/AggregationService.java
index bf653787948..ac0c196148a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/AggregationService.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/AggregationService.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.asapi.v3.dto.service;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/CustomASService.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/CustomASService.java
index 976571e6cf2..68c7359c623 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/CustomASService.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/CustomASService.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/CustomASServiceExecutionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/CustomASServiceExecutionOptions.java
index 2f8cd09d388..8e23fe30278 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/CustomASServiceExecutionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/CustomASServiceExecutionOptions.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.ethz.sis.openbis.generic.asapi.v3.dto.service;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.service.execute.AbstractExecutionOptionsWithParameters;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/ProcessingService.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/ProcessingService.java
index 0ab1341907c..99652ad8c9e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/ProcessingService.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/ProcessingService.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.asapi.v3.dto.service;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/ReportingService.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/ReportingService.java
index b487ee0c2e6..d4afa294c21 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/ReportingService.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/ReportingService.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.asapi.v3.dto.service;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/SearchDomainService.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/SearchDomainService.java
index c64d9a40b91..461e470cea9 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/SearchDomainService.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/SearchDomainService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.service;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/SearchDomainServiceExecutionResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/SearchDomainServiceExecutionResult.java
index d020bb7fbc1..60e2ef22569 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/SearchDomainServiceExecutionResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/SearchDomainServiceExecutionResult.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.asapi.v3.dto.service;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/SearchDomainServiceSearchOption.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/SearchDomainServiceSearchOption.java
index 17cf0a14494..0f2293efb5e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/SearchDomainServiceSearchOption.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/SearchDomainServiceSearchOption.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.asapi.v3.dto.service;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/AbstractExecutionOptionsWithParameters.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/AbstractExecutionOptionsWithParameters.java
index 3251822892c..9ad208c111e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/AbstractExecutionOptionsWithParameters.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/AbstractExecutionOptionsWithParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.service.execute;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/AggregationServiceExecutionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/AggregationServiceExecutionOptions.java
index 3063f9bf69a..f221cf79483 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/AggregationServiceExecutionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/AggregationServiceExecutionOptions.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.asapi.v3.dto.service.execute;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteAggregationServiceOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteAggregationServiceOperation.java
index bd9d386ec79..90e1bdb52e4 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteAggregationServiceOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteAggregationServiceOperation.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.asapi.v3.dto.service.execute;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteAggregationServiceOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteAggregationServiceOperationResult.java
index b4cf2b7f60e..fb2a66dc6a1 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteAggregationServiceOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteAggregationServiceOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.service.execute;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.TableModel;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteCustomASServiceOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteCustomASServiceOperation.java
index a2e381a6b36..1745c02898c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteCustomASServiceOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteCustomASServiceOperation.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.asapi.v3.dto.service.execute;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteCustomASServiceOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteCustomASServiceOperationResult.java
index 780094f9062..38a8796987a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteCustomASServiceOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteCustomASServiceOperationResult.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.ethz.sis.openbis.generic.asapi.v3.dto.service.execute;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteProcessingServiceOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteProcessingServiceOperation.java
index 8a9606a83a7..c8cb2a6edc6 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteProcessingServiceOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteProcessingServiceOperation.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.asapi.v3.dto.service.execute;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteProcessingServiceOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteProcessingServiceOperationResult.java
index c40f764986d..7b84ab47669 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteProcessingServiceOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteProcessingServiceOperationResult.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.asapi.v3.dto.service.execute;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteReportingServiceOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteReportingServiceOperation.java
index 229ae874733..cecd799412c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteReportingServiceOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteReportingServiceOperation.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.asapi.v3.dto.service.execute;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteReportingServiceOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteReportingServiceOperationResult.java
index a9ef68b7dbd..2b5ce1bbe9c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteReportingServiceOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteReportingServiceOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.service.execute;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.TableModel;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteSearchDomainServiceOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteSearchDomainServiceOperation.java
index f42e0488be0..ccdb5dbf79c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteSearchDomainServiceOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteSearchDomainServiceOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.service.execute;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteSearchDomainServiceOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteSearchDomainServiceOperationResult.java
index 3cfea86d68c..5edff2e3a2c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteSearchDomainServiceOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ExecuteSearchDomainServiceOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.service.execute;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ProcessingServiceExecutionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ProcessingServiceExecutionOptions.java
index 962578beb4a..41155e34ba9 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ProcessingServiceExecutionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ProcessingServiceExecutionOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.service.execute;
 
 import java.util.ArrayList;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ReportingServiceExecutionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ReportingServiceExecutionOptions.java
index 29f465fca31..4980d0f7ec5 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ReportingServiceExecutionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/ReportingServiceExecutionOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.service.execute;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/SearchDomainServiceExecutionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/SearchDomainServiceExecutionOptions.java
index 87da62444aa..6ecc8b37aa0 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/SearchDomainServiceExecutionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/execute/SearchDomainServiceExecutionOptions.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.asapi.v3.dto.service.execute;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/AggregationServiceFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/AggregationServiceFetchOptions.java
index 76252ce3ce5..2a97fa991d2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/AggregationServiceFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/AggregationServiceFetchOptions.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.asapi.v3.dto.service.fetchoptions;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/AggregationServiceSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/AggregationServiceSortOptions.java
index b6f4445f19a..b0fd8c20a5b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/AggregationServiceSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/AggregationServiceSortOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.service.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/CustomASServiceFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/CustomASServiceFetchOptions.java
index f55f82d4d33..e36076a9464 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/CustomASServiceFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/CustomASServiceFetchOptions.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/CustomASServiceSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/CustomASServiceSortOptions.java
index 9e68f693f89..5e0ef5497ef 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/CustomASServiceSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/CustomASServiceSortOptions.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.ethz.sis.openbis.generic.asapi.v3.dto.service.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/ProcessingServiceFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/ProcessingServiceFetchOptions.java
index c2cae5d2bd4..91035871ecc 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/ProcessingServiceFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/ProcessingServiceFetchOptions.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.asapi.v3.dto.service.fetchoptions;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/ProcessingServiceSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/ProcessingServiceSortOptions.java
index b85498629ad..e3deb9d76b2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/ProcessingServiceSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/ProcessingServiceSortOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.service.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/ReportingServiceFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/ReportingServiceFetchOptions.java
index dda014802e0..584c017a0b8 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/ReportingServiceFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/ReportingServiceFetchOptions.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.asapi.v3.dto.service.fetchoptions;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/ReportingServiceSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/ReportingServiceSortOptions.java
index 563889b0a2e..dbdf98ecfd7 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/ReportingServiceSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/ReportingServiceSortOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.service.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/SearchDomainServiceFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/SearchDomainServiceFetchOptions.java
index e9b8f7d44a6..2fb52d7a01a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/SearchDomainServiceFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/SearchDomainServiceFetchOptions.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.asapi.v3.dto.service.fetchoptions;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/SearchDomainServiceSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/SearchDomainServiceSortOptions.java
index cd3d7fd105c..4e50150d029 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/SearchDomainServiceSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/fetchoptions/SearchDomainServiceSortOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.service.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/id/CustomASServiceCode.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/id/CustomASServiceCode.java
index 5e4852432ee..1ddde42e3d1 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/id/CustomASServiceCode.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/id/CustomASServiceCode.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.ethz.sis.openbis.generic.asapi.v3.dto.service.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectPermId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/id/DssServicePermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/id/DssServicePermId.java
index 5f83f235e5f..8cc2ce7a857 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/id/DssServicePermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/id/DssServicePermId.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.asapi.v3.dto.service.id;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/id/ICustomASServiceId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/id/ICustomASServiceId.java
index a532c3c3be6..3fd23d51c6b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/id/ICustomASServiceId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/id/ICustomASServiceId.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.ethz.sis.openbis.generic.asapi.v3.dto.service.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/id/IDssServiceId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/id/IDssServiceId.java
index 8a6b7e53369..d0ca68eb897 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/id/IDssServiceId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/id/IDssServiceId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.service.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/AggregationServiceSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/AggregationServiceSearchCriteria.java
index 14ac0beb8e2..d38a52089ce 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/AggregationServiceSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/AggregationServiceSearchCriteria.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.asapi.v3.dto.service.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractObjectSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/CustomASServiceSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/CustomASServiceSearchCriteria.java
index 373f0ca3cb6..3cacdadab06 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/CustomASServiceSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/CustomASServiceSearchCriteria.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.asapi.v3.dto.service.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractObjectSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/ProcessingServiceSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/ProcessingServiceSearchCriteria.java
index 305fe84f0d9..d3d4fa7c10b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/ProcessingServiceSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/ProcessingServiceSearchCriteria.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.asapi.v3.dto.service.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractObjectSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/ReportingServiceSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/ReportingServiceSearchCriteria.java
index 7e1798d099f..189d8728fa2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/ReportingServiceSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/ReportingServiceSearchCriteria.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.asapi.v3.dto.service.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractObjectSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchAggregationServicesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchAggregationServicesOperation.java
index c881b3fe38e..fddc912d2a1 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchAggregationServicesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchAggregationServicesOperation.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.asapi.v3.dto.service.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchAggregationServicesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchAggregationServicesOperationResult.java
index 943fcd5e1a4..1fa248f3d6e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchAggregationServicesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchAggregationServicesOperationResult.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.asapi.v3.dto.service.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchCustomASServicesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchCustomASServicesOperation.java
index c3694818b93..ffe772bc42a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchCustomASServicesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchCustomASServicesOperation.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.asapi.v3.dto.service.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchCustomASServicesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchCustomASServicesOperationResult.java
index 917c1ec2681..32e31ae3b04 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchCustomASServicesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchCustomASServicesOperationResult.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.asapi.v3.dto.service.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchDomainServiceSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchDomainServiceSearchCriteria.java
index 65bf5b94b4f..707164c8482 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchDomainServiceSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchDomainServiceSearchCriteria.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.asapi.v3.dto.service.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractObjectSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchProcessingServicesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchProcessingServicesOperation.java
index dedc11f36da..2ad4fc9e253 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchProcessingServicesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchProcessingServicesOperation.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.asapi.v3.dto.service.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchProcessingServicesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchProcessingServicesOperationResult.java
index 876dc8608b8..147b0d624e7 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchProcessingServicesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchProcessingServicesOperationResult.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.asapi.v3.dto.service.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchReportingServicesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchReportingServicesOperation.java
index af4d69d5209..89a9064547b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchReportingServicesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchReportingServicesOperation.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.asapi.v3.dto.service.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchReportingServicesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchReportingServicesOperationResult.java
index b792ac64517..7db0f672a7e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchReportingServicesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchReportingServicesOperationResult.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.asapi.v3.dto.service.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchSearchDomainServicesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchSearchDomainServicesOperation.java
index 52f4d72bf4d..ea3ddd1411c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchSearchDomainServicesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchSearchDomainServicesOperation.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.asapi.v3.dto.service.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchSearchDomainServicesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchSearchDomainServicesOperationResult.java
index 94e41cbe0fe..5690be6a2d2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchSearchDomainServicesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/service/search/SearchSearchDomainServicesOperationResult.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.asapi.v3.dto.service.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/SessionInformation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/SessionInformation.java
index c0a19a0f27b..81e2cb71b44 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/SessionInformation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/SessionInformation.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/fetchoptions/SessionInformationFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/fetchoptions/SessionInformationFetchOptions.java
index 54d565902d1..6fbc7ba6d27 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/fetchoptions/SessionInformationFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/fetchoptions/SessionInformationFetchOptions.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/fetchoptions/SessionInformationSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/fetchoptions/SessionInformationSortOptions.java
index 326a4793967..425fa841094 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/fetchoptions/SessionInformationSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/fetchoptions/SessionInformationSortOptions.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.asapi.v3.dto.session.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/get/GetSessionInformationOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/get/GetSessionInformationOperation.java
index bb4b2ba1f31..dfb1ba310ed 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/get/GetSessionInformationOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/get/GetSessionInformationOperation.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.asapi.v3.dto.session.get;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/get/GetSessionInformationOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/get/GetSessionInformationOperationResult.java
index 73a4c7aa198..b68b3ad7352 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/get/GetSessionInformationOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/get/GetSessionInformationOperationResult.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.asapi.v3.dto.session.get;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.operation.IOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/id/ISessionInformationId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/id/ISessionInformationId.java
index 6d7ac0bfa2b..2ca6efe3ea4 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/id/ISessionInformationId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/id/ISessionInformationId.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.asapi.v3.dto.session.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/id/SessionInformationPermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/id/SessionInformationPermId.java
index 3c17e33303a..0d720899eb6 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/id/SessionInformationPermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/id/SessionInformationPermId.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.asapi.v3.dto.session.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectPermId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/search/PersonalAccessTokenSessionNameSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/search/PersonalAccessTokenSessionNameSearchCriteria.java
index fac053703de..76554ccc260 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/search/PersonalAccessTokenSessionNameSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/search/PersonalAccessTokenSessionNameSearchCriteria.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.asapi.v3.dto.session.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/search/PersonalAccessTokenSessionSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/search/PersonalAccessTokenSessionSearchCriteria.java
index 9dc5ddccdba..6c769c1e135 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/search/PersonalAccessTokenSessionSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/search/PersonalAccessTokenSessionSearchCriteria.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.asapi.v3.dto.session.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.BooleanFieldSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/search/SearchSessionInformationOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/search/SearchSessionInformationOperation.java
index 9677195a1ad..9b1a3a76918 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/search/SearchSessionInformationOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/search/SearchSessionInformationOperation.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.asapi.v3.dto.session.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/search/SearchSessionInformationOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/search/SearchSessionInformationOperationResult.java
index b96b61a6948..f99e37d8cf3 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/search/SearchSessionInformationOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/search/SearchSessionInformationOperationResult.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.asapi.v3.dto.session.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/search/SessionInformationSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/search/SessionInformationSearchCriteria.java
index d396ea8fe2a..1e62cb4151b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/search/SessionInformationSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/search/SessionInformationSearchCriteria.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.session.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractObjectSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/search/UserNameSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/search/UserNameSearchCriteria.java
index 65b8cf50f2a..c5e4fd2f9ce 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/search/UserNameSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/session/search/UserNameSearchCriteria.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.asapi.v3.dto.session.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchFieldType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/Space.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/Space.java
index 31963e9c551..9505f1b149a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/Space.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/Space.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/create/CreateSpacesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/create/CreateSpacesOperation.java
index ad90f85fc7b..f256a306a96 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/create/CreateSpacesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/create/CreateSpacesOperation.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.asapi.v3.dto.space.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/create/CreateSpacesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/create/CreateSpacesOperationResult.java
index 6247d3fd4e1..3311d853294 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/create/CreateSpacesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/create/CreateSpacesOperationResult.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.asapi.v3.dto.space.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/create/SpaceCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/create/SpaceCreation.java
index f80bd1bb65e..577c841c604 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/create/SpaceCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/create/SpaceCreation.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.asapi.v3.dto.space.create;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/delete/DeleteSpacesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/delete/DeleteSpacesOperation.java
index 1616e6777a4..d9be26edbe2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/delete/DeleteSpacesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/delete/DeleteSpacesOperation.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.asapi.v3.dto.space.delete;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/delete/DeleteSpacesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/delete/DeleteSpacesOperationResult.java
index 5d6118dc5e1..ec9c2e56b97 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/delete/DeleteSpacesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/delete/DeleteSpacesOperationResult.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.asapi.v3.dto.space.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.delete.DeleteObjectsWithoutTrashOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/delete/SpaceDeletionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/delete/SpaceDeletionOptions.java
index 605084f3c6b..43115ff59e3 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/delete/SpaceDeletionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/delete/SpaceDeletionOptions.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.asapi.v3.dto.space.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.AbstractObjectDeletionOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/fetchoptions/SpaceFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/fetchoptions/SpaceFetchOptions.java
index 38fd77bf1f0..44388f1dc4a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/fetchoptions/SpaceFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/fetchoptions/SpaceFetchOptions.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/fetchoptions/SpaceSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/fetchoptions/SpaceSortOptions.java
index 32fb9ee471c..d61680314f1 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/fetchoptions/SpaceSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/fetchoptions/SpaceSortOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.space.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.EntitySortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/get/GetSpacesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/get/GetSpacesOperation.java
index 293721d4215..9498aaf9b99 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/get/GetSpacesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/get/GetSpacesOperation.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.asapi.v3.dto.space.get;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/get/GetSpacesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/get/GetSpacesOperationResult.java
index 40f0a00a5d8..c89bf5a5ae8 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/get/GetSpacesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/get/GetSpacesOperationResult.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.asapi.v3.dto.space.get;
 
 import java.util.Map;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/id/ISpaceId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/id/ISpaceId.java
index 3ae907e7a0d..03f9905bf86 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/id/ISpaceId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/id/ISpaceId.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.ethz.sis.openbis.generic.asapi.v3.dto.space.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/id/SpacePermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/id/SpacePermId.java
index 554f96c921e..d34dcc76b5a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/id/SpacePermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/id/SpacePermId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.space.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectPermId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/id/SpaceTechId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/id/SpaceTechId.java
index 125f4d50f06..df4eb219d9c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/id/SpaceTechId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/id/SpaceTechId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.space.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectTechId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/search/NoSpaceSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/search/NoSpaceSearchCriteria.java
index 3ddedd4cd58..20a9284453a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/search/NoSpaceSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/search/NoSpaceSearchCriteria.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.asapi.v3.dto.space.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/search/SearchSpacesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/search/SearchSpacesOperation.java
index 796f8c6d268..ae82b740061 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/search/SearchSpacesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/search/SearchSpacesOperation.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.asapi.v3.dto.space.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/search/SearchSpacesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/search/SearchSpacesOperationResult.java
index 6fec2d8e717..18f24e7b33d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/search/SearchSpacesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/search/SearchSpacesOperationResult.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.asapi.v3.dto.space.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/search/SpaceSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/search/SpaceSearchCriteria.java
index 0b956f59297..5f9a1964ec0 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/search/SpaceSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/search/SpaceSearchCriteria.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.asapi.v3.dto.space.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractObjectSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/update/SpaceUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/update/SpaceUpdate.java
index b12ef307d4b..789a0043af4 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/update/SpaceUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/update/SpaceUpdate.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.asapi.v3.dto.space.update;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/update/UpdateSpacesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/update/UpdateSpacesOperation.java
index cc207157120..91b79153f18 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/update/UpdateSpacesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/update/UpdateSpacesOperation.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.asapi.v3.dto.space.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/update/UpdateSpacesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/update/UpdateSpacesOperationResult.java
index 2caf4e42b23..eb04ad888c2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/update/UpdateSpacesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/space/update/UpdateSpacesOperationResult.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.asapi.v3.dto.space.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/Tag.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/Tag.java
index 61b511b2eb0..10b95800ed2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/Tag.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/Tag.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/create/CreateTagsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/create/CreateTagsOperation.java
index ff3a54b1a09..013ae3e4583 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/create/CreateTagsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/create/CreateTagsOperation.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.asapi.v3.dto.tag.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/create/CreateTagsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/create/CreateTagsOperationResult.java
index 2f9b15a2f0e..9f9b94afa18 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/create/CreateTagsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/create/CreateTagsOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/create/TagCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/create/TagCreation.java
index c4b7e3ce16c..25751cc3ad4 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/create/TagCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/create/TagCreation.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.asapi.v3.dto.tag.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/delete/DeleteTagsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/delete/DeleteTagsOperation.java
index e08fad0549b..f9986b4eef9 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/delete/DeleteTagsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/delete/DeleteTagsOperation.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.asapi.v3.dto.tag.delete;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/delete/DeleteTagsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/delete/DeleteTagsOperationResult.java
index a6d4026ce39..9fe562620ea 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/delete/DeleteTagsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/delete/DeleteTagsOperationResult.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.ethz.sis.openbis.generic.asapi.v3.dto.tag.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.delete.DeleteObjectsWithoutTrashOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/delete/TagDeletionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/delete/TagDeletionOptions.java
index b5bacca797c..cead09a2873 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/delete/TagDeletionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/delete/TagDeletionOptions.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.asapi.v3.dto.tag.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.AbstractObjectDeletionOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/fetchoptions/TagFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/fetchoptions/TagFetchOptions.java
index a1e0f7d39b1..902dc08a09e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/fetchoptions/TagFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/fetchoptions/TagFetchOptions.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/fetchoptions/TagSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/fetchoptions/TagSortOptions.java
index 836185fd5f3..c41f015bb58 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/fetchoptions/TagSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/fetchoptions/TagSortOptions.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.asapi.v3.dto.tag.fetchoptions;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/get/GetTagsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/get/GetTagsOperation.java
index a29d9ef5010..be84c741992 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/get/GetTagsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/get/GetTagsOperation.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.asapi.v3.dto.tag.get;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/get/GetTagsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/get/GetTagsOperationResult.java
index 06d39ff1865..ae31cf2ec29 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/get/GetTagsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/get/GetTagsOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.get;
 
 import java.util.Map;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/id/ITagId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/id/ITagId.java
index 23c73bcc199..96ed290f998 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/id/ITagId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/id/ITagId.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.asapi.v3.dto.tag.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/id/TagCode.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/id/TagCode.java
index fabe680c531..4f850c7dc34 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/id/TagCode.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/id/TagCode.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.ethz.sis.openbis.generic.asapi.v3.dto.tag.id;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/id/TagPermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/id/TagPermId.java
index ee20c7a1128..ab6ae375120 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/id/TagPermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/id/TagPermId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.tag.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectPermId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/search/SearchTagsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/search/SearchTagsOperation.java
index 678bf556f3a..40e91921cdf 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/search/SearchTagsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/search/SearchTagsOperation.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.asapi.v3.dto.tag.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/search/SearchTagsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/search/SearchTagsOperationResult.java
index 457041ae0df..273163db2e5 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/search/SearchTagsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/search/SearchTagsOperationResult.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.asapi.v3.dto.tag.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/search/TagSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/search/TagSearchCriteria.java
index 0b44c412252..85c5bf34c98 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/search/TagSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/search/TagSearchCriteria.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.asapi.v3.dto.tag.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractObjectSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/update/TagUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/update/TagUpdate.java
index a0b003c1637..18a63623ce0 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/update/TagUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/update/TagUpdate.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.asapi.v3.dto.tag.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/update/UpdateTagsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/update/UpdateTagsOperation.java
index d115ca74060..69bd6480100 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/update/UpdateTagsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/update/UpdateTagsOperation.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.asapi.v3.dto.tag.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/update/UpdateTagsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/update/UpdateTagsOperationResult.java
index a96371a284f..f7f888f1e3c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/update/UpdateTagsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/tag/update/UpdateTagsOperationResult.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.asapi.v3.dto.tag.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/Vocabulary.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/Vocabulary.java
index 908644863fa..2ef85c70da3 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/Vocabulary.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/Vocabulary.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/VocabularyTerm.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/VocabularyTerm.java
index 72aa0f63e5b..f3365ad3a54 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/VocabularyTerm.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/VocabularyTerm.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/create/CreateVocabulariesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/create/CreateVocabulariesOperation.java
index 5a9159b02d9..a0ea6cca6b5 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/create/CreateVocabulariesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/create/CreateVocabulariesOperation.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.asapi.v3.dto.vocabulary.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/create/CreateVocabulariesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/create/CreateVocabulariesOperationResult.java
index f55d9068fdc..2397b481c5f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/create/CreateVocabulariesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/create/CreateVocabulariesOperationResult.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.asapi.v3.dto.vocabulary.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/create/CreateVocabularyTermsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/create/CreateVocabularyTermsOperation.java
index ca8c233ca7c..da7f2d9a494 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/create/CreateVocabularyTermsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/create/CreateVocabularyTermsOperation.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.asapi.v3.dto.vocabulary.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/create/CreateVocabularyTermsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/create/CreateVocabularyTermsOperationResult.java
index 72e442246ed..c809e19f7d9 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/create/CreateVocabularyTermsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/create/CreateVocabularyTermsOperationResult.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.asapi.v3.dto.vocabulary.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/create/VocabularyCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/create/VocabularyCreation.java
index 5e1ec16f699..fd2d2353eea 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/create/VocabularyCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/create/VocabularyCreation.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.asapi.v3.dto.vocabulary.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/create/VocabularyTermCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/create/VocabularyTermCreation.java
index 9de76ba4bbd..726f9524274 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/create/VocabularyTermCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/create/VocabularyTermCreation.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.asapi.v3.dto.vocabulary.create;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/delete/DeleteVocabulariesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/delete/DeleteVocabulariesOperation.java
index 4de6741ec4a..b9c02787728 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/delete/DeleteVocabulariesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/delete/DeleteVocabulariesOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.delete;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/delete/DeleteVocabulariesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/delete/DeleteVocabulariesOperationResult.java
index 08428304a0e..db43da2b325 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/delete/DeleteVocabulariesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/delete/DeleteVocabulariesOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.delete.DeleteObjectsWithoutTrashOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/delete/DeleteVocabularyTermsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/delete/DeleteVocabularyTermsOperation.java
index 054cd470462..7af9f9edb57 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/delete/DeleteVocabularyTermsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/delete/DeleteVocabularyTermsOperation.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.asapi.v3.dto.vocabulary.delete;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/delete/DeleteVocabularyTermsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/delete/DeleteVocabularyTermsOperationResult.java
index dd926d3a81e..9fc1fa453c2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/delete/DeleteVocabularyTermsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/delete/DeleteVocabularyTermsOperationResult.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.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.delete.DeleteObjectsWithoutTrashOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/delete/VocabularyDeletionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/delete/VocabularyDeletionOptions.java
index e5f399e340f..1d0b8deb9f1 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/delete/VocabularyDeletionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/delete/VocabularyDeletionOptions.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.asapi.v3.dto.vocabulary.delete;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.AbstractObjectDeletionOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/delete/VocabularyTermDeletionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/delete/VocabularyTermDeletionOptions.java
index 703c0ae3d44..d028b3775b6 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/delete/VocabularyTermDeletionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/delete/VocabularyTermDeletionOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.delete;
 
 import java.util.ArrayList;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/delete/VocabularyTermReplacement.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/delete/VocabularyTermReplacement.java
index 2e5adbb0edb..b8e56442f63 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/delete/VocabularyTermReplacement.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/delete/VocabularyTermReplacement.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.asapi.v3.dto.vocabulary.delete;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularyFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularyFetchOptions.java
index 3461adb10f2..ccaa771bcc9 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularyFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularyFetchOptions.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularySortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularySortOptions.java
index e145b5ef3bf..22b3b05ddd7 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularySortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularySortOptions.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.asapi.v3.dto.vocabulary.fetchoptions;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularyTermFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularyTermFetchOptions.java
index 72315b9db9d..fe216145d57 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularyTermFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularyTermFetchOptions.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/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularyTermSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularyTermSortOptions.java
index 444e86c0a87..3ee5fc71c9c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularyTermSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/fetchoptions/VocabularyTermSortOptions.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.asapi.v3.dto.vocabulary.fetchoptions;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/get/GetVocabulariesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/get/GetVocabulariesOperation.java
index a852ed8f805..88d3a347815 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/get/GetVocabulariesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/get/GetVocabulariesOperation.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/get/GetVocabulariesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/get/GetVocabulariesOperationResult.java
index c81035c76f5..eeaf004b395 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/get/GetVocabulariesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/get/GetVocabulariesOperationResult.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/get/GetVocabularyTermsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/get/GetVocabularyTermsOperation.java
index c03fd201a2a..665ad97bea8 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/get/GetVocabularyTermsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/get/GetVocabularyTermsOperation.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.asapi.v3.dto.vocabulary.get;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/get/GetVocabularyTermsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/get/GetVocabularyTermsOperationResult.java
index 4466b69a901..3f54918551c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/get/GetVocabularyTermsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/get/GetVocabularyTermsOperationResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.get;
 
 import java.util.Map;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/IVocabularyId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/IVocabularyId.java
index 1e0fc608662..10ef13d6e28 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/IVocabularyId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/IVocabularyId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/IVocabularyTermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/IVocabularyTermId.java
index 57a70346cfa..6fffaa04d30 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/IVocabularyTermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/IVocabularyTermId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/VocabularyPermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/VocabularyPermId.java
index b58d437117b..5e0a3863e4f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/VocabularyPermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/VocabularyPermId.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.asapi.v3.dto.vocabulary.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.ObjectPermId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/VocabularyTermPermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/VocabularyTermPermId.java
index 627fedbe4a6..54691221c38 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/VocabularyTermPermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/id/VocabularyTermPermId.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.asapi.v3.dto.vocabulary.id;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/search/SearchVocabulariesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/search/SearchVocabulariesOperation.java
index 411d8deda89..62386319224 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/search/SearchVocabulariesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/search/SearchVocabulariesOperation.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.asapi.v3.dto.vocabulary.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/search/SearchVocabulariesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/search/SearchVocabulariesOperationResult.java
index 4265aaabe93..1c6a0818381 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/search/SearchVocabulariesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/search/SearchVocabulariesOperationResult.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.asapi.v3.dto.vocabulary.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/search/SearchVocabularyTermsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/search/SearchVocabularyTermsOperation.java
index b2c42147b87..b0778edfd75 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/search/SearchVocabularyTermsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/search/SearchVocabularyTermsOperation.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.asapi.v3.dto.vocabulary.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperation;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/search/SearchVocabularyTermsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/search/SearchVocabularyTermsOperationResult.java
index aa40f871561..b90a0cefec1 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/search/SearchVocabularyTermsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/search/SearchVocabularyTermsOperationResult.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.asapi.v3.dto.vocabulary.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchObjectsOperationResult;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/search/VocabularySearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/search/VocabularySearchCriteria.java
index 874b75df868..f1b4955de34 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/search/VocabularySearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/search/VocabularySearchCriteria.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.asapi.v3.dto.vocabulary.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractObjectSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/search/VocabularyTermSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/search/VocabularyTermSearchCriteria.java
index 0a5df7446d6..2fa090a2b61 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/search/VocabularyTermSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/search/VocabularyTermSearchCriteria.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.asapi.v3.dto.vocabulary.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractObjectSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/update/UpdateVocabulariesOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/update/UpdateVocabulariesOperation.java
index 853c5069074..efe10e87dd8 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/update/UpdateVocabulariesOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/update/UpdateVocabulariesOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, SIS
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.vocabulary.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/update/UpdateVocabulariesOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/update/UpdateVocabulariesOperationResult.java
index d5bf62e2a0c..6bea4e4a939 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/update/UpdateVocabulariesOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/update/UpdateVocabulariesOperationResult.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.asapi.v3.dto.vocabulary.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/update/UpdateVocabularyTermsOperation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/update/UpdateVocabularyTermsOperation.java
index e4c317af43a..9c5b9eb0611 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/update/UpdateVocabularyTermsOperation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/update/UpdateVocabularyTermsOperation.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.asapi.v3.dto.vocabulary.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/update/UpdateVocabularyTermsOperationResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/update/UpdateVocabularyTermsOperationResult.java
index b5286807fae..fad3360ec65 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/update/UpdateVocabularyTermsOperationResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/update/UpdateVocabularyTermsOperationResult.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.asapi.v3.dto.vocabulary.update;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/update/VocabularyTermUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/update/VocabularyTermUpdate.java
index 86c5a6cfb6f..9f634eb2839 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/update/VocabularyTermUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/update/VocabularyTermUpdate.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.asapi.v3.dto.vocabulary.update;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/update/VocabularyUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/update/VocabularyUpdate.java
index 7175d58abda..3997e2e7295 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/update/VocabularyUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/vocabulary/update/VocabularyUpdate.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.asapi.v3.dto.vocabulary.update;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/WebAppSetting.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/WebAppSetting.java
index 5d8b06d98dc..642548d8e05 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/WebAppSetting.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/WebAppSetting.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.asapi.v3.dto.webapp;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/WebAppSettings.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/WebAppSettings.java
index a2ad3df7497..72728e7313b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/WebAppSettings.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/WebAppSettings.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.asapi.v3.dto.webapp;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/create/WebAppSettingCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/create/WebAppSettingCreation.java
index 7f00a79e68d..b6edf975f4a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/create/WebAppSettingCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/create/WebAppSettingCreation.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.asapi.v3.dto.webapp.create;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/fetchoptions/WebAppSettingsFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/fetchoptions/WebAppSettingsFetchOptions.java
index 969bf46e0fa..b7a30bdabde 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/fetchoptions/WebAppSettingsFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/fetchoptions/WebAppSettingsFetchOptions.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/fetchoptions/WebAppSettingsFetchOptionsAllSettingsHandler.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/fetchoptions/WebAppSettingsFetchOptionsAllSettingsHandler.java
index 4ce3e254536..f770f90a0ff 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/fetchoptions/WebAppSettingsFetchOptionsAllSettingsHandler.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/fetchoptions/WebAppSettingsFetchOptionsAllSettingsHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.dto.webapp.fetchoptions;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/fetchoptions/WebAppSettingsFetchOptionsSettingsHandler.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/fetchoptions/WebAppSettingsFetchOptionsSettingsHandler.java
index 6700f3ee244..47d3ce199a0 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/fetchoptions/WebAppSettingsFetchOptionsSettingsHandler.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/fetchoptions/WebAppSettingsFetchOptionsSettingsHandler.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.asapi.v3.dto.webapp.fetchoptions;
 
 import java.util.Collection;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/fetchoptions/WebAppSettingsSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/fetchoptions/WebAppSettingsSortOptions.java
index 54553a5090f..f770bb2574a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/fetchoptions/WebAppSettingsSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/fetchoptions/WebAppSettingsSortOptions.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.asapi.v3.dto.webapp.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/update/WebAppSettingsUpdateValue.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/update/WebAppSettingsUpdateValue.java
index 6452573252a..8b0ddc4ce7e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/update/WebAppSettingsUpdateValue.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/webapp/update/WebAppSettingsUpdateValue.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.asapi.v3.dto.webapp.update;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.update.ListUpdateValue;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/exceptions/NotFetchedException.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/exceptions/NotFetchedException.java
index 04247f923e1..b52ad140bd8 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/exceptions/NotFetchedException.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/exceptions/NotFetchedException.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.asapi.v3.exceptions;
 
 import ch.systemsx.cisd.common.exceptions.UserFailureException;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/exceptions/ObjectNotFoundException.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/exceptions/ObjectNotFoundException.java
index 1ef5b948b91..0fec71546d3 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/exceptions/ObjectNotFoundException.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/exceptions/ObjectNotFoundException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.exceptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/exceptions/UnauthorizedObjectAccessException.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/exceptions/UnauthorizedObjectAccessException.java
index 80167ce00a8..a6d9bf4acb2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/exceptions/UnauthorizedObjectAccessException.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/exceptions/UnauthorizedObjectAccessException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.exceptions;
 
 import java.util.Iterator;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/exceptions/UnsupportedObjectIdException.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/exceptions/UnsupportedObjectIdException.java
index 1426f4ea728..a2e491d0c9a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/exceptions/UnsupportedObjectIdException.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/exceptions/UnsupportedObjectIdException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.asapi.v3.exceptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/listener/IOperationListener.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/listener/IOperationListener.java
index 673e47949f7..3a43450515c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/listener/IOperationListener.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/listener/IOperationListener.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.asapi.v3.plugin.listener;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.IApplicationServerApi;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/service/ICustomASServiceExecutor.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/service/ICustomASServiceExecutor.java
index b9c32d6ebf5..322ffebb402 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/service/ICustomASServiceExecutor.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/service/ICustomASServiceExecutor.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.asapi.v3.plugin.service;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/service/IImportService.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/service/IImportService.java
index 11cff71a171..b6fdfa3e19b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/service/IImportService.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/service/IImportService.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.asapi.v3.plugin.service;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreType;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/service/context/CustomASServiceContext.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/service/context/CustomASServiceContext.java
index 2dee0183c31..10174e0aa26 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/service/context/CustomASServiceContext.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/service/context/CustomASServiceContext.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.asapi.v3.plugin.service.context;
 
 /**
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/service/context/ServiceContext.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/service/context/ServiceContext.java
index f3e66487c46..91d64f29d6d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/service/context/ServiceContext.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/plugin/service/context/ServiceContext.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.asapi.v3.plugin.service.context;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/IDataStoreServerApi.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/IDataStoreServerApi.java
index 4059dc09be7..ecb61f95f8e 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/IDataStoreServerApi.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/IDataStoreServerApi.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.ethz.sis.openbis.generic.dssapi.v3;
 
 import java.io.InputStream;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/dataset/create/FullDataSetCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/dataset/create/FullDataSetCreation.java
index 6c1035141af..a1acbfb2202 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/dataset/create/FullDataSetCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/dataset/create/FullDataSetCreation.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.dssapi.v3.dto.dataset.create;
 
 import java.util.List;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/dataset/create/UploadedDataSetCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/dataset/create/UploadedDataSetCreation.java
index 4fef85ecab4..a6c8ac75857 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/dataset/create/UploadedDataSetCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/dataset/create/UploadedDataSetCreation.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.ethz.sis.openbis.generic.dssapi.v3.dto.dataset.create;
 
 import java.util.HashMap;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/DataSetFile.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/DataSetFile.java
index b701364f845..0195420e03b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/DataSetFile.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/DataSetFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.dssapi.v3.dto.datasetfile;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/create/DataSetFileCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/create/DataSetFileCreation.java
index 5923e2c0c2f..541315350df 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/create/DataSetFileCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/create/DataSetFileCreation.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.dssapi.v3.dto.datasetfile.create;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/download/DataSetFileDownload.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/download/DataSetFileDownload.java
index c1acd43a9e8..31f8034c9b0 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/download/DataSetFileDownload.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/download/DataSetFileDownload.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 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.ethz.sis.openbis.generic.dssapi.v3.dto.datasetfile.download;
 
 import java.io.InputStream;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/download/DataSetFileDownloadOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/download/DataSetFileDownloadOptions.java
index e8349fbb69e..478f1e7d6ae 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/download/DataSetFileDownloadOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/download/DataSetFileDownloadOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.dssapi.v3.dto.datasetfile.download;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/download/DataSetFileDownloadReader.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/download/DataSetFileDownloadReader.java
index 550a6c06aff..1d35fc8c2bc 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/download/DataSetFileDownloadReader.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/download/DataSetFileDownloadReader.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.dssapi.v3.dto.datasetfile.download;
 
 import java.io.ByteArrayInputStream;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/fastdownload/FastDownloadMethod.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/fastdownload/FastDownloadMethod.java
index dee01a8c941..6014858f863 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/fastdownload/FastDownloadMethod.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/fastdownload/FastDownloadMethod.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.dssapi.v3.dto.datasetfile.fastdownload;
 
 import ch.ethz.sis.filetransfer.IDownloadServer;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/fastdownload/FastDownloadParameter.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/fastdownload/FastDownloadParameter.java
index 1730b980235..1a641e75fdb 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/fastdownload/FastDownloadParameter.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/fastdownload/FastDownloadParameter.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.dssapi.v3.dto.datasetfile.fastdownload;
 
 import ch.ethz.sis.filetransfer.IDownloadServer;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/fastdownload/FastDownloadSession.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/fastdownload/FastDownloadSession.java
index ad393918dce..8200c37bd1c 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/fastdownload/FastDownloadSession.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/fastdownload/FastDownloadSession.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.dssapi.v3.dto.datasetfile.fastdownload;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/fastdownload/FastDownloadSessionOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/fastdownload/FastDownloadSessionOptions.java
index e0771b0803c..2e64be6173f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/fastdownload/FastDownloadSessionOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/fastdownload/FastDownloadSessionOptions.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.dssapi.v3.dto.datasetfile.fastdownload;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/fetchoptions/DataSetFileFetchOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/fetchoptions/DataSetFileFetchOptions.java
index 64e29b20176..a6960a255a2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/fetchoptions/DataSetFileFetchOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/fetchoptions/DataSetFileFetchOptions.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.
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/fetchoptions/DataSetFileSortOptions.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/fetchoptions/DataSetFileSortOptions.java
index 7ef00b47501..e566206573a 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/fetchoptions/DataSetFileSortOptions.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/fetchoptions/DataSetFileSortOptions.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.ethz.sis.openbis.generic.dssapi.v3.dto.datasetfile.fetchoptions;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.SortOptions;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/id/DataSetFilePermId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/id/DataSetFilePermId.java
index e3f6a282eaa..44eb0e0fdba 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/id/DataSetFilePermId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/id/DataSetFilePermId.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.dssapi.v3.dto.datasetfile.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.ObjectToString;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/id/IDataSetFileId.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/id/IDataSetFileId.java
index 9326231600e..0c0bd87d039 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/id/IDataSetFileId.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/id/IDataSetFileId.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.dssapi.v3.dto.datasetfile.id;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.id.IObjectId;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/search/DataSetFileSearchCriteria.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/search/DataSetFileSearchCriteria.java
index 4e0cda4e20c..5f2fddd9482 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/search/DataSetFileSearchCriteria.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/dto/datasetfile/search/DataSetFileSearchCriteria.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.ethz.sis.openbis.generic.dssapi.v3.dto.datasetfile.search;
 
 import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractCompositeSearchCriteria;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/fastdownload/FastDownloadResult.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/fastdownload/FastDownloadResult.java
index 15fbedce600..7ea22689278 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/fastdownload/FastDownloadResult.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/fastdownload/FastDownloadResult.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.dssapi.v3.fastdownload;
 
 import java.nio.file.Path;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/fastdownload/FastDownloadUtils.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/fastdownload/FastDownloadUtils.java
index 1eb54a6330a..e1992fa16e9 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/fastdownload/FastDownloadUtils.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/fastdownload/FastDownloadUtils.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.dssapi.v3.fastdownload;
 
 import java.io.IOException;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/fastdownload/FastDownloader.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/fastdownload/FastDownloader.java
index 52ad17d22d7..a12af0d0b1f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/fastdownload/FastDownloader.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/fastdownload/FastDownloader.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.dssapi.v3.fastdownload;
 
 import java.io.File;
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/fastdownload/RemoteFastDownloadServer.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/fastdownload/RemoteFastDownloadServer.java
index f8fcc0746e1..3b2625f33f8 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/fastdownload/RemoteFastDownloadServer.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/dssapi/v3/fastdownload/RemoteFastDownloadServer.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.dssapi.v3.fastdownload;
 
 import java.io.IOException;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/IGeneralInformationChangingService.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/IGeneralInformationChangingService.java
index 516b2f620e5..78b76213468 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/IGeneralInformationChangingService.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/IGeneralInformationChangingService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,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.List;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/IGeneralInformationService.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/IGeneralInformationService.java
index bf7e8c74cc2..cb0855eb0f3 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/IGeneralInformationService.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/IGeneralInformationService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,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.EnumSet;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/AbstractEntitySearchResultLocation.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/AbstractEntitySearchResultLocation.java
index 478f96fdd90..e74300d22ad 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/AbstractEntitySearchResultLocation.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/AbstractEntitySearchResultLocation.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.systemsx.cisd.openbis.generic.shared.api.v1.dto;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/AlignmentMatch.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/AlignmentMatch.java
index c4672a53af4..6231977a1e2 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/AlignmentMatch.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/AlignmentMatch.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.shared.api.v1.dto;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Attachment.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Attachment.java
index 1c72f80a8e5..8c9b4b9301f 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Attachment.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Attachment.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.api.v1.dto;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/BlastScore.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/BlastScore.java
index 6a67a1e6bb0..b31e0a4953e 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/BlastScore.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/BlastScore.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.shared.api.v1.dto;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/ControlledVocabularyPropertyType.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/ControlledVocabularyPropertyType.java
index be29d08d666..fd385d77669 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/ControlledVocabularyPropertyType.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/ControlledVocabularyPropertyType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,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/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSet.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSet.java
index 80dc053bef0..e0a55880987 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSet.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,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.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetFetchOption.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetFetchOption.java
index 3e1be3fd670..4f798c995b9 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetFetchOption.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetFetchOption.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.dto;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetFetchOptions.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetFetchOptions.java
index 785dde55e82..dc562d31fcb 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetFetchOptions.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetFetchOptions.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.api.v1.dto;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetFileBlastSearchResultLocation.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetFileBlastSearchResultLocation.java
index cbc223b29c1..1479e3888b9 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetFileBlastSearchResultLocation.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetFileBlastSearchResultLocation.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.shared.api.v1.dto;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetFileSearchResultLocation.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetFileSearchResultLocation.java
index 5113b6aae13..2de697ee202 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetFileSearchResultLocation.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetFileSearchResultLocation.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.shared.api.v1.dto;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetKind.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetKind.java
index c76915e345c..6357ae3b3b9 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetKind.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetKind.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.api.v1.dto;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetType.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetType.java
index d3e29d3f582..edeb950505f 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetType.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetType.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.apache.commons.lang3.builder.ToStringBuilder;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetTypeFilter.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetTypeFilter.java
index 8cf53bff35c..8d765c3c409 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetTypeFilter.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSetTypeFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,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/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataStore.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataStore.java
index bcc1c237120..deeea00eeb1 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataStore.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataStore.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.api.v1.dto;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataStoreURLForDataSets.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataStoreURLForDataSets.java
index 9d79a1645cb..f9cdcd95525 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataStoreURLForDataSets.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataStoreURLForDataSets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,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.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DeletedEntity.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DeletedEntity.java
index b16b4070dad..827ba328487 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DeletedEntity.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DeletedEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,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.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Deletion.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Deletion.java
index f91f373c4d5..9b797bf9803 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Deletion.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Deletion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.generic.shared.api.v1.dto;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DeletionFetchOption.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DeletionFetchOption.java
index ff4a45f208f..86bc1cd8c2d 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DeletionFetchOption.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DeletionFetchOption.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.systemsx.cisd.openbis.generic.shared.api.v1.dto;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DeletionType.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DeletionType.java
index 06dbd6317e8..eb5edbb6d3e 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DeletionType.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DeletionType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 ETH Zuerich, Scientific IT Services
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.generic.shared.api.v1.dto;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/EntityKind.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/EntityKind.java
index da1db9d6c5b..b3fc02c247a 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/EntityKind.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/EntityKind.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.systemsx.cisd.openbis.generic.shared.api.v1.dto;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/EntityPropertyBlastSearchResultLocation.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/EntityPropertyBlastSearchResultLocation.java
index 4949a7317ca..221c8be028d 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/EntityPropertyBlastSearchResultLocation.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/EntityPropertyBlastSearchResultLocation.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.shared.api.v1.dto;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/EntityPropertySearchResultLocation.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/EntityPropertySearchResultLocation.java
index 5c5e4b98dfe..ca774b9f95e 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/EntityPropertySearchResultLocation.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/EntityPropertySearchResultLocation.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.shared.api.v1.dto;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/EntityRegistrationDetails.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/EntityRegistrationDetails.java
index af767d5b355..59cb89b20ce 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/EntityRegistrationDetails.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/EntityRegistrationDetails.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,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.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/EntityType.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/EntityType.java
index 17de0394910..eb67a511ab7 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/EntityType.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/EntityType.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.api.v1.dto;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/EntityTypeInitializer.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/EntityTypeInitializer.java
index 466e03a8c37..e3a7ebb8365 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/EntityTypeInitializer.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/EntityTypeInitializer.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.api.v1.dto;
 
 import java.util.ArrayList;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Experiment.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Experiment.java
index 65f898bfa19..c479f01fef9 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Experiment.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Experiment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,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.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/ExperimentType.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/ExperimentType.java
index 84fcee7bc82..37060e09a00 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/ExperimentType.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/ExperimentType.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.api.v1.dto;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/ISearchDomainResultLocation.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/ISearchDomainResultLocation.java
index f3a4f6a1cf3..f14ba21a108 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/ISearchDomainResultLocation.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/ISearchDomainResultLocation.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.generic.shared.api.v1.dto;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/ISearchDomainResultScore.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/ISearchDomainResultScore.java
index 0629ebe5c52..463b297f67a 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/ISearchDomainResultScore.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/ISearchDomainResultScore.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.generic.shared.api.v1.dto;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/InitializingChecks.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/InitializingChecks.java
index 5a3fbf65a5e..9a5e245bd6f 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/InitializingChecks.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/InitializingChecks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,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;
 
 /**
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Material.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Material.java
index 526b3c60667..c5cbc2abc77 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Material.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Material.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.api.v1.dto;
 
 import java.util.ArrayList;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/MaterialIdentifier.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/MaterialIdentifier.java
index 4e4079baf92..f5345189502 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/MaterialIdentifier.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/MaterialIdentifier.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.api.v1.dto;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/MaterialTypeIdentifier.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/MaterialTypeIdentifier.java
index ecdad48d35e..5ca4200ac31 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/MaterialTypeIdentifier.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/MaterialTypeIdentifier.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.api.v1.dto;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/MetaprojectAssignments.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/MetaprojectAssignments.java
index 37757d98ad7..486839fb73f 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/MetaprojectAssignments.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/MetaprojectAssignments.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.generic.shared.api.v1.dto;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/MetaprojectAssignmentsIds.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/MetaprojectAssignmentsIds.java
index a3835a2ff89..347aab73711 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/MetaprojectAssignmentsIds.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/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.api.v1.dto;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/NewVocabularyTerm.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/NewVocabularyTerm.java
index 9732dfb6e4c..c4e46c8570d 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/NewVocabularyTerm.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/NewVocabularyTerm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,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.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Project.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Project.java
index 14ab4ffb5cc..a4919b453e2 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Project.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Project.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,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.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/PropertyType.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/PropertyType.java
index 38f27c7073d..dccba948cdc 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/PropertyType.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/PropertyType.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 java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/PropertyTypeGroup.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/PropertyTypeGroup.java
index 9fd77cca7be..4e9e12039f5 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/PropertyTypeGroup.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/PropertyTypeGroup.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 java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Role.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Role.java
index 3ae6e793ce8..3c8844486dc 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Role.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Role.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,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.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Sample.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Sample.java
index e1cc2d3e4b4..acf8d4ff29f 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Sample.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Sample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,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.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SampleFetchOption.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SampleFetchOption.java
index 515d74cd323..96f7b14d7f5 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SampleFetchOption.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SampleFetchOption.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.dto;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SampleType.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SampleType.java
index 0acb49eeaaa..3296e0b686f 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SampleType.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SampleType.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.api.v1.dto;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchCriteria.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchCriteria.java
index d31ce8f4fc9..12e8b139e58 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchCriteria.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchCriteria.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,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.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchDomain.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchDomain.java
index 1e8ac8d844c..1b253aac7c7 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchDomain.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchDomain.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.shared.api.v1.dto;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchDomainSearchOption.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchDomainSearchOption.java
index 07f37aaf24d..bfcf0f62e31 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchDomainSearchOption.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchDomainSearchOption.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.shared.api.v1.dto;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchDomainSearchResult.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchDomainSearchResult.java
index a42847eef5e..5a70628d418 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchDomainSearchResult.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchDomainSearchResult.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.shared.api.v1.dto;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchSubCriteria.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchSubCriteria.java
index 159ec400a7e..af4c53a152b 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchSubCriteria.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchSubCriteria.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.api.v1.dto;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchableEntityKind.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchableEntityKind.java
index efadcd4f3bc..c7871d1c867 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchableEntityKind.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchableEntityKind.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.api.v1.dto;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SpaceWithProjectsAndRoleAssignments.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SpaceWithProjectsAndRoleAssignments.java
index 2952f5b0829..e0847a1b2a2 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SpaceWithProjectsAndRoleAssignments.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SpaceWithProjectsAndRoleAssignments.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 ETH Zuerich, CISD
+ * Copyright ETH 2010 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,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.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/ValidationPluginInfo.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/ValidationPluginInfo.java
index 87e7e057006..cd5fb731bd7 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/ValidationPluginInfo.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/ValidationPluginInfo.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.api.v1.dto;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Vocabulary.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Vocabulary.java
index 05104d2295a..ddd559cf295 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/Vocabulary.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/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.shared.api.v1.dto;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/VocabularyTerm.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/VocabularyTerm.java
index 2f82151420f..0e0c416afa6 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/VocabularyTerm.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/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.shared.api.v1.dto;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/WebAppSettings.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/WebAppSettings.java
index 172c17651bf..ce404050113 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/WebAppSettings.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/WebAppSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,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.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/IObjectId.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/IObjectId.java
index 021013baa87..0fe3cdbb1d6 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/IObjectId.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/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.api.v1.dto.id;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/ObjectIdentifierId.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/ObjectIdentifierId.java
index 6579a2c5563..fcf821dac3d 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/ObjectIdentifierId.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/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.api.v1.dto.id;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/ObjectPermIdId.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/ObjectPermIdId.java
index 6417c93e9ec..6455bc8f6ba 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/ObjectPermIdId.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/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.api.v1.dto.id;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/ObjectTechIdId.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/ObjectTechIdId.java
index db81053cac3..faa6b1fd574 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/ObjectTechIdId.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/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.api.v1.dto.id;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/dataset/DataSetCodeId.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/dataset/DataSetCodeId.java
index 5a573cb62ea..4c90443a5c8 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/dataset/DataSetCodeId.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/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.api.v1.dto.id.dataset;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/dataset/DataSetTechIdId.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/dataset/DataSetTechIdId.java
index a164449ab10..77d6768261c 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/dataset/DataSetTechIdId.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/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.api.v1.dto.id.dataset;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/dataset/IDataSetId.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/dataset/IDataSetId.java
index 4aba633f1cb..6b529a9441f 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/dataset/IDataSetId.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/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.api.v1.dto.id.dataset;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/experiment/ExperimentIdentifierId.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/experiment/ExperimentIdentifierId.java
index 50a3f7102bf..557b226af41 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/experiment/ExperimentIdentifierId.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/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.api.v1.dto.id.experiment;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/experiment/ExperimentPermIdId.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/experiment/ExperimentPermIdId.java
index 8ccf324dbed..0b411d07b7a 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/experiment/ExperimentPermIdId.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/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.api.v1.dto.id.experiment;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/experiment/ExperimentTechIdId.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/experiment/ExperimentTechIdId.java
index 4b8f04dcc36..9204ebef51c 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/experiment/ExperimentTechIdId.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/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.api.v1.dto.id.experiment;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/experiment/IExperimentId.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/experiment/IExperimentId.java
index 828d6ccc627..fe3005aab82 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/experiment/IExperimentId.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/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.api.v1.dto.id.experiment;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/material/IMaterialId.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/material/IMaterialId.java
index 373f05c53ea..0e2459fd4c3 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/material/IMaterialId.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/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.api.v1.dto.id.material;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/material/MaterialCodeAndTypeCodeId.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/material/MaterialCodeAndTypeCodeId.java
index 995d31210a5..afee3584710 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/material/MaterialCodeAndTypeCodeId.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/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.api.v1.dto.id.material;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/material/MaterialTechIdId.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/material/MaterialTechIdId.java
index a395edf68df..b08e9f7a72d 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/material/MaterialTechIdId.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/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.api.v1.dto.id.material;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/metaproject/IMetaprojectId.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/metaproject/IMetaprojectId.java
index 6ccbcd3b2e1..368b26a8e1c 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/metaproject/IMetaprojectId.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/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.api.v1.dto.id.metaproject;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/metaproject/MetaprojectIdentifierId.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/metaproject/MetaprojectIdentifierId.java
index 2c69ffc4b59..6e8d0e13095 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/metaproject/MetaprojectIdentifierId.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/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.api.v1.dto.id.metaproject;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/metaproject/MetaprojectTechIdId.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/metaproject/MetaprojectTechIdId.java
index a8f1cdafb3f..96dac8e0878 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/metaproject/MetaprojectTechIdId.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/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.api.v1.dto.id.metaproject;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/project/IProjectId.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/project/IProjectId.java
index 7495c8e4ede..f77ded08051 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/project/IProjectId.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/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.api.v1.dto.id.project;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/project/ProjectIdentifierId.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/project/ProjectIdentifierId.java
index 57e2fa598c3..377ff03fcb5 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/project/ProjectIdentifierId.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/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.api.v1.dto.id.project;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/project/ProjectPermIdId.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/project/ProjectPermIdId.java
index 524a9951f87..f3ffedc3297 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/project/ProjectPermIdId.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/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.api.v1.dto.id.project;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/project/ProjectTechIdId.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/project/ProjectTechIdId.java
index 059e1283723..d4877b0fcc2 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/project/ProjectTechIdId.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/project/ProjectTechIdId.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.api.v1.dto.id.project;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/sample/ISampleId.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/sample/ISampleId.java
index 50b3662ee08..85fa5c8b56c 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/sample/ISampleId.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/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.api.v1.dto.id.sample;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/sample/SampleIdentifierId.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/sample/SampleIdentifierId.java
index 80293e4f538..d59e63db22a 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/sample/SampleIdentifierId.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/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.api.v1.dto.id.sample;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/sample/SamplePermIdId.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/sample/SamplePermIdId.java
index b2e2205ba30..f2c372c6d9f 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/sample/SamplePermIdId.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/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.api.v1.dto.id.sample;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/sample/SampleTechIdId.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/sample/SampleTechIdId.java
index e83b3cee37a..7a372472803 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/sample/SampleTechIdId.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/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.api.v1.dto.id.sample;
 
 import ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/filter/AndDataSetFilter.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/filter/AndDataSetFilter.java
index e968814897a..1cc0b086e1a 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/filter/AndDataSetFilter.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/filter/AndDataSetFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,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 ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.DataSet;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/filter/IDataSetFilter.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/filter/IDataSetFilter.java
index 3b7e99fc15f..a875b2adec3 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/filter/IDataSetFilter.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/filter/IDataSetFilter.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.api.v1.filter;
 
 import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.DataSet;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/filter/PropertiesBasedDataSetFilter.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/filter/PropertiesBasedDataSetFilter.java
index ddc4f13c7c4..74886ac340c 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/filter/PropertiesBasedDataSetFilter.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/filter/PropertiesBasedDataSetFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,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.ArrayList;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/filter/TypeBasedDataSetFilter.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/filter/TypeBasedDataSetFilter.java
index 09e000a7393..5cf0acc31c9 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/filter/TypeBasedDataSetFilter.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/filter/TypeBasedDataSetFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 ETH Zuerich, CISD
+ * Copyright ETH 2011 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,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 ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.DataSet;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/util/JsonPropertyUtil.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/util/JsonPropertyUtil.java
index 6dad089d3c8..38911dc66a4 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/util/JsonPropertyUtil.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/util/JsonPropertyUtil.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.api.v1.util;
 
 /**
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ICodeHolder.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ICodeHolder.java
index 5c9535b2f26..854872c72b0 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ICodeHolder.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ICodeHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +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/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IIdAndCodeHolder.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IIdAndCodeHolder.java
index f2d7791801b..0662e26b899 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IIdAndCodeHolder.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IIdAndCodeHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +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/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IIdHolder.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IIdHolder.java
index 4adeefe621c..6f54dc801d2 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IIdHolder.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IIdHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +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/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IIdentifierHolder.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IIdentifierHolder.java
index 3aef3b51516..b4bd6e2d080 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IIdentifierHolder.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IIdentifierHolder.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;
 
 /**
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IRegistratorAndModifierHolder.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IRegistratorAndModifierHolder.java
index 1a36d84fbd9..2a386ee66b9 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IRegistratorAndModifierHolder.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IRegistratorAndModifierHolder.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.Person;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IRegistratorHolder.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IRegistratorHolder.java
index ec5e0e538d0..01bc01a881a 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IRegistratorHolder.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IRegistratorHolder.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.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/TechId.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/TechId.java
index 24945f66563..13dc6f2ba52 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/TechId.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/TechId.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;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractRegistrationHolder.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractRegistrationHolder.java
index f7be57db922..badb5abfcce 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractRegistrationHolder.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AbstractRegistrationHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,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/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Code.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Code.java
index 51c092076d6..625d0db288c 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Code.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/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.basic.dto;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CodeWithRegistration.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CodeWithRegistration.java
index 8f385d6c940..ffbf807bf6d 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CodeWithRegistration.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CodeWithRegistration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,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.ICodeHolder;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CodeWithRegistrationAndModificationDate.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CodeWithRegistrationAndModificationDate.java
index bfe5767ef4d..cc749e66cf5 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CodeWithRegistrationAndModificationDate.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/CodeWithRegistrationAndModificationDate.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.util.Date;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataTypeCode.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataTypeCode.java
index 8dc89891831..feec0eca8f3 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataTypeCode.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DataTypeCode.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/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatabaseInstance.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatabaseInstance.java
index 4e3c24b6c5b..4a249fdd7d4 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatabaseInstance.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatabaseInstance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,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.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityKind.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityKind.java
index 18ba93423bd..84ef6b74a5c 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityKind.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,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/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExternalDataManagementSystem.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExternalDataManagementSystem.java
index 5d7f2c2c2ad..b4ab3d0195d 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExternalDataManagementSystem.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExternalDataManagementSystem.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.shared.basic.dto;
 
 /*
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExternalDataManagementSystemType.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExternalDataManagementSystemType.java
index d9d97dcc69d..2fb118cac72 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExternalDataManagementSystemType.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ExternalDataManagementSystemType.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.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/FetchOption.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/FetchOption.java
index 7bd6d42088c..82d3ca5783e 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/FetchOption.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/FetchOption.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/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/FetchOptions.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/FetchOptions.java
index 5321fd7b21c..c9a1ad65064 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/FetchOptions.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/FetchOptions.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.io.Serializable;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IMetaprojectRegistration.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IMetaprojectRegistration.java
index c9fb387dcb2..0f2798afcd8 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IMetaprojectRegistration.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IMetaprojectRegistration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,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/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IMetaprojectUpdates.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IMetaprojectUpdates.java
index 6d9a76d034c..9efd41eeaa2 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IMetaprojectUpdates.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IMetaprojectUpdates.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/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IVocabularyTermUpdates.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IVocabularyTermUpdates.java
index 27cc734c01d..5a18b3f19c5 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IVocabularyTermUpdates.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IVocabularyTermUpdates.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/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IVocabularyUpdates.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IVocabularyUpdates.java
index 0856d213dd0..71a9d4c0c90 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IVocabularyUpdates.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/IVocabularyUpdates.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/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Metaproject.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Metaproject.java
index 66ef8871cab..077c42baabb 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Metaproject.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Metaproject.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/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectIdentifier.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectIdentifier.java
index 5ea15cbb873..c44e4322ef4 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectIdentifier.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectIdentifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,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/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectNullRegistration.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectNullRegistration.java
index b23079de1cf..b9a2e3797db 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectNullRegistration.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectNullRegistration.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 ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectNullUpdates.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectNullUpdates.java
index 0276f67a14a..bb7d3a24f22 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectNullUpdates.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/MetaprojectNullUpdates.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 ch.systemsx.cisd.base.annotation.JsonObject;
diff --git a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Person.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Person.java
index 24be8baa599..227b462be92 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Person.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Person.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,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/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ServiceVersionHolder.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ServiceVersionHolder.java
index 3f2fc099d80..032e5376dae 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ServiceVersionHolder.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ServiceVersionHolder.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/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Vocabulary.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Vocabulary.java
index 92892a1b123..4352529ddfa 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Vocabulary.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Vocabulary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,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/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTerm.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTerm.java
index ac0c53ea1b5..8ae4f93de51 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTerm.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTerm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,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/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/util/JsonPropertyUtil.java b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/util/JsonPropertyUtil.java
index c89ba067ba7..79a9bf99d05 100644
--- a/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/util/JsonPropertyUtil.java
+++ b/api-openbis-java/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/util/JsonPropertyUtil.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.util;
 
 /**
diff --git a/api-openbis-java/sourceTest/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentFetchOptionsTest.java b/api-openbis-java/sourceTest/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentFetchOptionsTest.java
index c913480ba41..ab94781da8d 100644
--- a/api-openbis-java/sourceTest/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentFetchOptionsTest.java
+++ b/api-openbis-java/sourceTest/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/fetchoptions/ExperimentFetchOptionsTest.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.asapi.v3.dto.experiment.fetchoptions;
 
 import static org.testng.Assert.assertEquals;
diff --git a/api-openbis-java/sourceTest/java/ch/ethz/sis/openbis/generic/asapi/v3/exceptions/UnauthorizedObjectAccessExceptionTest.java b/api-openbis-java/sourceTest/java/ch/ethz/sis/openbis/generic/asapi/v3/exceptions/UnauthorizedObjectAccessExceptionTest.java
index f4acd7e4935..143228fffe6 100644
--- a/api-openbis-java/sourceTest/java/ch/ethz/sis/openbis/generic/asapi/v3/exceptions/UnauthorizedObjectAccessExceptionTest.java
+++ b/api-openbis-java/sourceTest/java/ch/ethz/sis/openbis/generic/asapi/v3/exceptions/UnauthorizedObjectAccessExceptionTest.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.asapi.v3.exceptions;
 
 import static org.testng.Assert.assertEquals;
diff --git a/api-openbis-java/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/ApiClassesProvider.java b/api-openbis-java/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/ApiClassesProvider.java
index 06f3c7462bf..049067f4ffa 100644
--- a/api-openbis-java/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/ApiClassesProvider.java
+++ b/api-openbis-java/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/ApiClassesProvider.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.sharedapi.v3;
 
 import java.io.Serializable;
diff --git a/api-openbis-java/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/EnglishCheck.java b/api-openbis-java/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/EnglishCheck.java
index 66b57db1d5b..81419e1db66 100644
--- a/api-openbis-java/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/EnglishCheck.java
+++ b/api-openbis-java/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/EnglishCheck.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.sharedapi.v3;
 
 import java.lang.reflect.Field;
diff --git a/api-openbis-java/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/EnglishDictionary.java b/api-openbis-java/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/EnglishDictionary.java
index 3027a0f21c3..24a8720d434 100644
--- a/api-openbis-java/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/EnglishDictionary.java
+++ b/api-openbis-java/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/EnglishDictionary.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.sharedapi.v3;
 
 import java.io.BufferedReader;
diff --git a/api-openbis-java/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/ToStringCheck.java b/api-openbis-java/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/ToStringCheck.java
index a4abcfc4494..a487d4f1f78 100644
--- a/api-openbis-java/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/ToStringCheck.java
+++ b/api-openbis-java/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/ToStringCheck.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.generic.sharedapi.v3;
 
 import static org.testng.Assert.assertEquals;
diff --git a/api-openbis-java/sourceTest/java/ch/systemsx/cisd/openbis/DependencyCheckingTest.java b/api-openbis-java/sourceTest/java/ch/systemsx/cisd/openbis/DependencyCheckingTest.java
index 7328d11627a..4958a83de44 100644
--- a/api-openbis-java/sourceTest/java/ch/systemsx/cisd/openbis/DependencyCheckingTest.java
+++ b/api-openbis-java/sourceTest/java/ch/systemsx/cisd/openbis/DependencyCheckingTest.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;
 
 import org.testng.annotations.Test;
diff --git a/api-openbis-java/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/filter/TypeBasedDataSetFilterTest.java b/api-openbis-java/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/filter/TypeBasedDataSetFilterTest.java
index 0bb40903a52..1f696d9b748 100644
--- a/api-openbis-java/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/filter/TypeBasedDataSetFilterTest.java
+++ b/api-openbis-java/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/filter/TypeBasedDataSetFilterTest.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.filter;
 
 import org.testng.AssertJUnit;
-- 
GitLab