59889: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
59662: Merged V4.2.1 (4.2.1) to V4.2-BUG-FIX (4.2.2)
59613: Merged DEV to V4.2.1
59345: MNT-10267: Authority Search does not work for groups with Unicode display name
- Modify GetAuthoritiesCannedQuery to respect unicode.
59514: MNT-10267: Authority Search does not work for groups with Unicode display name
- Add unit test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62208 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59887: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
59643: Merged DEV to V4.2-BUG-FIX (4.2.2)
59235: MNT-10223 : CMIS: Created document has incorrect value on Properties tab
Fixed the isLatestMajorVersion() implementation to return false if the
version of the doc is minor.
59236: MNT-10223 : CMIS: Created document has incorrect value on Properties tab
Added a test for the issue.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62205 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59886: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
59621: Merged DEV to V4.2-BUG-FIX
58258: MNT-10038 : CIFS and FTP accessing repo without transactions for MNT-9806
58307: MNT-10038 - MNT-9806 Corrected transaction test error in ContentDiskDriverTest
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62203 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59882: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
59607: Merged DEV to V4.2-BUG-FIX
58111: Ensure a transaction is present while initialising the DictionaryRepositoryBootstrap (Repo-based dictionary) (MNT-9806)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62198 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59881: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
59606: Merged DEV to V4.2-BUG-FIX
58106: Fixed formatting in MailActionExecuter found during investigations
58107: Fixed formatting issues in ActionExecuterAbstractBase found during investigations
58108: Further detection of transaction state in the base action code (MNT-9806)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62197 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59880: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
59604: Merged DEV to V4.2-BUG-FIX
58029: Fix LicenseComponent to use a transaction when fetching descriptors from the repo (MNT-9806)
- Possible relation to ALF-19629: BM-0013: SOAK: v420b214_01: DescriptorService intercepts retrying exception during concurrent start
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62196 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59855: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
59601: Merged DEV to V4.2-BUG-FIX
58003: Prevent QNameDAO from being used without a txn (MNT-9806)
58022: Fix bootstrap sequencing issues related to Content Publishing and Site models
- I thought I had broken something but it's one of those random bean loading issues that we don't commonly see
- Pulled models into core model lists so that we know and understand the ordering of the model loading
- Removed QNameDAO transaction check, just in case (will reapply it with subsequent commit)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62193 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59851: Merged BRANCHES/DEV/mward/head_bf_gdata_upgd to BRANCHES/DEV/HEAD-BUG-FIX (local cache improvements):
59586: DefaultSimpleCache max size is Integer.MAX_VALUE when configured with maxItems of 0.
59590: maxItems for DefaultSimpleCache is now an optional feature.
59592: non-clustered caches will not use size-based eviction when {cacheName}.eviction-policy=NONE, to match clustered caches.
59594: Added TTL to DefaultSimpleCache - not yet configurable through the factory.
59602: DefaultCacheFactory can create caches with a time-to-live setting enabled.
59620: Organise imports for DefaultSimpleCache
59622: DefaultSimpleCache: changed field name from map to cache, as this makes more sense with changing to use of CacheBuilder.
59627: Added maxIdleSecs property to DefaultSimpleCache - not yet configurable from the cache factory.
59629: DefaultCacheFactory now supports maxIdleSeconds property for configuring non-clustered caches.
59633: Updated description of supported non-clustered cache properties in caches.properties
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62192 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59850: Merged BRANCHES/DEV/mward/head_bf_gdata_upgd to BRANCHES/DEV/HEAD-BUG-FIX (upgrade gdata libs):
59515: Removed gdata-1.45.0 libraries.
59516: Removed concurrentlinkedhashmap-lru-1.2 library.
59518: Added gdata-1.47.1 library JARs (dependencies to follow)
59521: Added gdata-1.47.1 dependencies (guava-11.0.2 and JSR-305)
59524: Updated ant build files to use gdata-1.47.1
59528: Removed outdated gdata-1.45.0 src zip.
59530: Added gdata-1.47.1 src zip
59531: Update eclipse .classpath with gdata 1.47.1 libraries
59532: Exported new gdata-1.47.1 and guava-11 libs from 3rd party project
59559: Fix DefaultSimpleCache to use a Guava Cache, replacing ConcurrentLinkedHashMap usage.
59568: Reverted r59516: concurrentlinkedhashmap lib is required by Surf.
59572: Replaced use of google-collections with guava in repository's pom.xml
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62191 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59746: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
59561: Merged DEV to V4.2-BUG-FIX (4.2.1)
59104: MNT-10197 : Intermittent test failure: RenditionServicePermissionsTest.userWithoutDeleteAccessTo(etc)
Implemented a retry mechanism to solve the intermittent test failures.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62185 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59741: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
59512: MNT-10255: Merged DEV to V4.2-BUG-FIX (4.2.1).
59393: MNT-10255 Mac OS -CIFS: Collaborator/editor can delete content created by other site members after editing.
- In ScenarioTempDeleteShuffle.createInstance() was added check: (operation instanceof MoveFileOperation).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62180 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59734: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
59507: Reverse Merged - Wrong commit was made
59504 : MNT-10255: Merged DEV to V4.2-BUG-FIX (4.2.1).
59393: MNT-10255 Mac OS -CIFS: Collaborator/editor can delete content created by other site members after editing.
- In ScenarioTempDeleteShuffle.createInstance() was added check: (operation instanceof MoveFileOperation).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62177 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59732: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
59504: MNT-10255: Merged DEV to V4.2-BUG-FIX (4.2.1).
59393: MNT-10255 Mac OS -CIFS: Collaborator/editor can delete content created by other site members after editing.
- In ScenarioTempDeleteShuffle.createInstance() was added check: (operation instanceof MoveFileOperation).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62175 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59554: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
59450: MNT-9967: Using db-count for process/task entities for retreiving counts, instead of using actual list size (activiti)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62165 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59337: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (4.3/Cloud)
59273: Merged DEV to V4.2-BUG-FIX (4.2.1)
58959, 59195 : MNT-10111 : MSSQL: JBPM: A plenty of schema differences are present after schema bootstrap on a clean start
- Type names only validator added. Validate nvarchar(max) fields with it
- TypeNameOnlyValidatorTest added for TypeNameOnlyValidator
59299: MNT-10111 : MSSQL: JBPM: A plenty of schema differences are present after schema bootstrap on a clean start
- Additional commit of Schema-Reference-JBPM.xml, it was corrupted in r59273
59335: Fix errors introduced into mergeinfo in r59273 (MNT-10111)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62129 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59278: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
59275: MNT-10109 (and MNT-10237): Permissions are not restored when a deleted site is recovered from the trashcan
Fix InvitationCleanupTest failure by purging archived test site from trashcan so that sitename can be reused
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62128 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59269: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
59268: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
59264: MNT-10237: Merged V4.1.6 (4.1.6.4) to V4.1-BUG-FIX (4.1.8) AGAIN!
58707: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
58676: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
- Delete associated groups on callback when archived site is purged. Add unit test for case.
58895: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
58855: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
- Fix unit tests failure by purging archived sites. Forbid new site creation if site group already exists.
58871: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
- Return beforePurgeNode callback binding to Site class.
58947: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
58946: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
- Fix test failures by purging deleted sites from trashcan so that sitename can be reused. Change SiteServiceImplTest to avoid database deadlock.
58949: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
58948: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
- Fix test failures by purging deleted sites from trashcan so that sitename can be reused.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62125 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59267: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (4.3/Cloud)
59266: Reverse Merge attempt at merging from V4.1-BUG-FIX (will do it again)
AND record only merge the original commits 59231,59239 and reverse merge 59262 that took place on V4.1-BUG-FIX
59237: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
59231: MNT-10237: Merged V4.1.6 (4.1.6.4) to V4.1-BUG-FIX (4.1.8)
58895: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
58855: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
- Fix unit tests failure by purging archived sites. Forbid new site creation if site group already exists.
58871: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
- Return beforePurgeNode callback binding to Site class.
58947: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
58946: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
- Fix test failures by purging deleted sites from trashcan so that sitename can be reused. Change SiteServiceImplTest to avoid database deadlock.
58949: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
58948: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
- Fix test failures by purging deleted sites from trashcan so that sitename can be reused.
59240: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
59239: MNT-10237: Permissions are not restored when a deleted site is recovered from the trashcan
- The merge of the HF commit on 4.1.6 removed a variable that was not being used, but
was being used in later versions.
59241: MNT-10237: Permissions are not restored when a deleted site is recovered from the trashcan
- Correct error in merge from V4.1-BUG-FIX to V4.2-BUG-FIX
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62124 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59259: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
59241: MNT-10237: Permissions are not restored when a deleted site is recovered from the trashcan
- Correct error in merge from V4.1-BUG-FIX to V4.2-BUG-FIX
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62123 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59258: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
59240: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
59239: MNT-10237: Permissions are not restored when a deleted site is recovered from the trashcan
- The merge of the HF commit on 4.1.6 removed a variable that was not being used, but
was being used in later versions.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62122 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59256: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
59237: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
59231: MNT-10237: Merged V4.1.6 (4.1.6.4) to V4.1-BUG-FIX (4.1.8)
58895: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
58855: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
- Fix unit tests failure by purging archived sites. Forbid new site creation if site group already exists.
58871: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
- Return beforePurgeNode callback binding to Site class.
58947: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
58946: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
- Fix test failures by purging deleted sites from trashcan so that sitename can be reused. Change SiteServiceImplTest to avoid database deadlock.
58949: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
58948: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
- Fix test failures by purging deleted sites from trashcan so that sitename can be reused.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62120 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59253: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
59199: Reverse Merged as it caused regression MNT-10075
55285: Merged BRANCHES/DEV/BELARUS/HEAD-2013_08_27 to BRANCHES/V4.2:
55068: ALF-19915 : MT and WebDAV: Content is lost when uploading non-empty document
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62117 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59252: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
59196: Merged DEV to V4.2-BUG-FIX (4.2.1)
58963 : MNT-10006: SPP: NPE occurs for recurrent event which occurs monthly/yearly on any weekday/weekend day
- Support of day/weekday/weekend recurrence pattern was implemented
- Unit tests are added.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62116 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59250: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
59188: MNT-9996: All day Calendar events do not show for the first day in the Share Site Calendar grid.
Fix unit tests failure. Detect allday events as events with the same start and end dates which have UTC midnight time.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62114 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59246: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
59143: MNT-9996: All day Calendar events do not show for the first day in the Share Site Calendar grid.
Force all day events to last from midnight till next midnight in current timezone so that they can be compared correctly and included into the requested range
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62110 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59177: Fixes SlowContentStoreTest test breakage. Removes dependency on cachingstore/test-context.xml
This fix essentially denormalizes the various Spring context XML files in the cachingstore directory. A previous fix had aliased the cachingContentStore to fileContentStore, but unfortunately this broke the SlowContentStoreTest tests, as the cachingContentStore created by those tests is not a real/working content store (the backingStore is a SlowContentStore dummy store), so the bootstrap process failed.
By making each of the contexts standalone, the different tests are able to evolve as required without breaking the other tests.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62108 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59123: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
59111: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
59070: Merged DEV to V4.1-BUG-FIX (4.1.8)
58849: MNT-10096: MT: AbstractTenantRoutingContentStore can return null list of stores
- Ensure that RetryingTransactionHelper starts a transaction in txn-after-completion phase (MNT-9806).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62103 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59064: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
59042: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
58919 : MNT-9205 : Search by IM property with spaces doesn't work
- Using correct regexp to split search term. Added a test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62089 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59034: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
59000: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
- Missing file in last commit
58913: Fix MT ContentStore so that it cannot return a null store
- It was dependent, for some reason, on a cluster-aware cache that would be prone to nulling
but the code just assumed that if it tried to set the value a few times it would stick.
- Fixed transaction demarcation so that a transaction is always present when using the store.
This is not ideal but it is inherently a repo-aware component and therefore needs it
- MNT-9806: Prevent post-transaction handlers from rendering threads unusable
- MNT-10096: MT: AbstractTenantRoutingContentStore can return null list of stores
Merged from DEV/DEREK/MNT-9806 r58833
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62078 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59033: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
58999: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
58913: Fix MT ContentStore so that it cannot return a null store
- It was dependent, for some reason, on a cluster-aware cache that would be prone to nulling
but the code just assumed that if it tried to set the value a few times it would stick.
- Fixed transaction demarcation so that a transaction is always present when using the store.
This is not ideal but it is inherently a repo-aware component and therefore needs it
- MNT-9806: Prevent post-transaction handlers from rendering threads unusable
- MNT-10096: MT: AbstractTenantRoutingContentStore can return null list of stores
Merged from DEV/DEREK/MNT-9806 r58833
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62077 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59021: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
58878: Merged DEV to V4.2-BUG-FIX (4.2.1)
58843: MNT-10137 : Update of document.name during creation leads to execution of a content rule specified for deletion (outbound)
Added BeforeMoveNodePolicy binding to BeforeDeleteChildAssociationRuleTrigger to handle renames via move correctly.
58645: ALF-12726 : Update of document.name during creation leads to execution of a content rule specified for deletion (outbound)
Added a JUnit test to reproduce the issue.
58670: MNT-10137 : Update of document.name during creation leads to execution of a content rule specified for deletion (outbound)
Added an additional check to the test that reproduces the issue (does not pass).
Added a test that uses NodeService to rename the node (passes).
58675: MNT-10137 : Update of document.name during creation leads to execution of a content rule specified for deletion (outbound)
Added fixes to the test.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62065 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
59013: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
58856: Merged DEV to V4.2-BUG-FIX (4.2.1)
58845: ALF-18922 : Remove non empty emailserver:alias aspect results in orphaned alias
Changed the policy binding for remove alias.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62061 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261