dongsug.song [Tue, 30 Jul 2024 06:43:23 +0000 (15:43 +0900)]
[Tizen] Update WebView changes from tizen_7.0
Change-Id: I2091b44ccf3b73b0bd23832adc62ec49d0c74aa5
joogab.yun [Tue, 23 Jul 2024 05:03:36 +0000 (14:03 +0900)]
[Tizen] Fix VOA crash issue
This reverts commit
1f1c14ff2f13a3ed5e6964af255d575b1fdebb26.
Change-Id: I42395e2c63459456dc5509f1b43e06b512818199
joogab.yun [Tue, 23 Jul 2024 05:03:22 +0000 (14:03 +0900)]
[Tizen] Support asan build option
This reverts commit
f6da98b7dccaa3cdf12d063cb25e268c0e124eea.
Change-Id: I958046b6f106de38e13d0842bd71c1fa3736438b
joogab.yun [Tue, 23 Jul 2024 05:03:15 +0000 (14:03 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: I513b24e863948a73f2c033ccdfd491e3904360fa
joogab.yun [Tue, 23 Jul 2024 05:03:10 +0000 (14:03 +0900)]
Revert "[Tizen] Support asan build option"
This reverts commit
6a19c38f8bf9eb514d40e763df694835b496f830.
joogab.yun [Tue, 23 Jul 2024 05:03:06 +0000 (14:03 +0900)]
Revert "[Tizen] Fix VOA crash issue"
This reverts commit
97e5488dba02d95b33b36a74c49789c0e989f3ae.
Adam Bialogonski [Fri, 19 Jul 2024 06:54:52 +0000 (07:54 +0100)]
DALi Version 2.3.33
Change-Id: I687c3d184d339e47d9b7a74dcf33761022913b7e
Bowon Ryu [Tue, 16 Jul 2024 05:11:25 +0000 (14:11 +0900)]
[Tizen] Fix VOA crash issue
This reverts commit
e2f040dd4a01029d8b2d1d81a56a1e32a6e3d63b.
Bowon Ryu [Tue, 16 Jul 2024 05:11:18 +0000 (14:11 +0900)]
[Tizen] Support asan build option
This reverts commit
e8b1e4d1774c6fc42844c66e1fb3262a9d26ee65.
Bowon Ryu [Tue, 16 Jul 2024 05:11:01 +0000 (14:11 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: I47064f3ac831583bba466e7340b25f0a715f0559
Bowon Ryu [Tue, 16 Jul 2024 05:10:56 +0000 (14:10 +0900)]
Revert "[Tizen] Support asan build option"
This reverts commit
efa06ee70e082c97f08dd3f3639d474c3ef11002.
Bowon Ryu [Tue, 16 Jul 2024 05:10:51 +0000 (14:10 +0900)]
Revert "[Tizen] Fix VOA crash issue"
This reverts commit
32d65d00fdef8d5ebbf1f384c61188bc2714fed4.
David Steele [Fri, 12 Jul 2024 10:12:26 +0000 (11:12 +0100)]
DALi Version 2.3.32
Change-Id: I2b2b8d72e6a9067b5a8555bb9ecafdc637e416b1
sunghyun kim [Wed, 10 Jul 2024 07:27:06 +0000 (16:27 +0900)]
[Tizen] Fix VOA crash issue
This reverts commit
30184741a1c9f63102a2b4c40f39ee4b8be634da.
sunghyun kim [Wed, 10 Jul 2024 07:26:48 +0000 (16:26 +0900)]
[Tizen] Support asan build option
This reverts commit
61c065c4923f57568386f7cbec8607b0216eb349.
sunghyun kim [Wed, 10 Jul 2024 07:26:43 +0000 (16:26 +0900)]
Merge branch 'devel/master' into tizen
sunghyun kim [Wed, 10 Jul 2024 07:26:36 +0000 (16:26 +0900)]
Revert "[Tizen] Support asan build option"
This reverts commit
cbbeb5d177e78b298f6d89e2ac1c799baeed5c83.
sunghyun kim [Wed, 10 Jul 2024 07:26:33 +0000 (16:26 +0900)]
Revert "[Tizen] Fix VOA crash issue"
This reverts commit
9e1454de1e3c70ebd9bc63cf9689d2a2770fe733.
Jeongmin Lee [Wed, 10 Jul 2024 01:01:12 +0000 (01:01 +0000)]
Merge "Binding RenderEffect(BackgroundBlurEFfect)" into devel/master
jmm [Tue, 25 Jun 2024 03:53:26 +0000 (12:53 +0900)]
Binding RenderEffect(BackgroundBlurEFfect)
Change-Id: I06772ab5011a0056785757c8fa495612a7d14722
Adam Bialogonski [Fri, 5 Jul 2024 09:08:27 +0000 (10:08 +0100)]
DALi Version 2.3.31
Change-Id: I671195fc2a30f62b9311b64144b2be1f2b6a1c8b
Eunki, Hong [Wed, 3 Jul 2024 07:44:08 +0000 (16:44 +0900)]
Check adaptor validation at ProcessController.Initialize() time
Since we don't allow to call Initialize() and Awake() at worker thread,
we need to check the thread safety at that time.
Change-Id: I647ca286aa240080161f457b4e484ac4310357e7
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>
jmm [Tue, 2 Jul 2024 06:37:41 +0000 (15:37 +0900)]
[Tizen] Fix VOA crash issue
This reverts commit
3050f60dc9d32590454aa1194fae7cf6801fb4fc.
Change-Id: Ib39885af362cc0d3e3601d812da3f259d32c73dd
jmm [Tue, 2 Jul 2024 06:37:25 +0000 (15:37 +0900)]
[Tizen] Support asan build option
This reverts commit
ad92f92461309bd9dbab0704292d4e83feab0cc8.
Change-Id: I0450481d7d6d478e717db6effcba4bcd0578094e
jmm [Tue, 2 Jul 2024 06:37:14 +0000 (15:37 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: I7886633ffd430a8dda15b0355f5be7d94254004d
jmm [Tue, 2 Jul 2024 06:37:02 +0000 (15:37 +0900)]
Revert "[Tizen] Support asan build option"
This reverts commit
47be548585b930bc96f9f62799cf00094167e85d.
jmm [Tue, 2 Jul 2024 06:36:59 +0000 (15:36 +0900)]
Revert "[Tizen] Fix VOA crash issue"
This reverts commit
bf2b21f59254339b23c96d92c66bdc2ff78f06d6.
Seungho Baek [Tue, 2 Jul 2024 06:20:13 +0000 (15:20 +0900)]
Make Capture returns ImageUrl
- This patch makes Capture simply return ImageUrl instead of NativeImageSource.
Change-Id: I64b2c5203542f65248338fe4a2d2e45bafb98d27
Signed-off-by: Seungho Baek <sbsh.baek@samsung.com>
Adeel Kazmi [Fri, 28 Jun 2024 10:15:01 +0000 (10:15 +0000)]
Merge "DALi Version 2.3.30" into devel/master
Richard Huang [Fri, 28 Jun 2024 10:10:47 +0000 (11:10 +0100)]
DALi Version 2.3.30
Change-Id: I1d86482bebddc48f5b4ff11474b346aff8a8cd7a
Wonsik Jung [Tue, 25 Jun 2024 06:44:24 +0000 (15:44 +0900)]
Binding new Window APIs to support modal and always top window
Change-Id: I4c29745bc0c4bb58f9698a535cd6e7e68b3d877d
Wonsik Jung [Wed, 26 Jun 2024 07:14:17 +0000 (16:14 +0900)]
[Tizen] Fix VOA crash issue
This reverts commit
3601887951731bd0354383af2d9ca9668733e0b0.
Wonsik Jung [Wed, 26 Jun 2024 07:13:52 +0000 (16:13 +0900)]
[Tizen] Support asan build option
This reverts commit
109f1038d8a5be73df50ffd027e4a62b85ca9c5b.
Wonsik Jung [Wed, 26 Jun 2024 07:13:35 +0000 (16:13 +0900)]
Merge branch 'devel/master' into tizen
Wonsik Jung [Wed, 26 Jun 2024 07:13:25 +0000 (16:13 +0900)]
Revert "[Tizen] Support asan build option"
This reverts commit
f10e2659fe177df7601062d9ae8b924e3ada940d.
Wonsik Jung [Wed, 26 Jun 2024 07:13:22 +0000 (16:13 +0900)]
Revert "[Tizen] Fix VOA crash issue"
This reverts commit
3900c6302f24accc1a32d0b3e5c29a5046a8f0b2.
Wonsik Jung [Wed, 26 Jun 2024 07:13:18 +0000 (16:13 +0900)]
Revert "[Tizen] Revert "Binding IsGeometryHittestEnabled()""
This reverts commit
40de931b39489a33cff27d80adacfdc3f22c7b65.
Wonsik Jung [Wed, 26 Jun 2024 07:12:18 +0000 (16:12 +0900)]
Revert "[Tizen] Revert "(CanvasView) Support rasterization request manually""
This reverts commit
cae2d31142a52a173f84fe706066df9ec3850a6d.
David Steele [Fri, 21 Jun 2024 11:48:04 +0000 (12:48 +0100)]
DALi Version 2.3.29
Change-Id: Iab0a4e7378a336625f5b80d7472131cd04fc8393
Youngsun Suh [Thu, 20 Jun 2024 03:37:33 +0000 (03:37 +0000)]
Merge "Pass shared_ptr to Register/UnregisterDefaultLabel" into devel/master
Youngsun Suh [Fri, 14 Jun 2024 07:04:11 +0000 (16:04 +0900)]
Pass shared_ptr to Register/UnregisterDefaultLabel
Change-Id: I8e10353487a4268049fab5874984cc6b31acd902
jykeon [Tue, 18 Jun 2024 09:18:55 +0000 (18:18 +0900)]
[Tizen] Revert "(CanvasView) Support rasterization request manually"
This reverts commit
5ae42edfae7e8b2d6fd5af252840c28691f7817e.
Change-Id: I150cf606d49d38bc8e6ff72410994d40787ea36b
jykeon [Tue, 18 Jun 2024 09:08:48 +0000 (18:08 +0900)]
[Tizen] Revert "Binding IsGeometryHittestEnabled()"
This reverts commit
458445adea8c77ba22438346b532df7fd1ce8b9c.
Change-Id: I91e026c96e440e1ac25f3a35ecf5ea567183d020
jykeon [Tue, 18 Jun 2024 08:57:39 +0000 (17:57 +0900)]
[Tizen] Fix VOA crash issue
This reverts commit
19bcddda4f5b034e64e5263a12a317bc6e461f3f.
jykeon [Tue, 18 Jun 2024 08:57:01 +0000 (17:57 +0900)]
[Tizen] Support asan build option
This reverts commit
3bb3ff3d51126c80d9fbfdb2fb1a17ceda2cc8a3.
jykeon [Tue, 18 Jun 2024 08:56:13 +0000 (17:56 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: Iaa03de2270f39d6e4f2cce67d00b30753d26af7b
jykeon [Tue, 18 Jun 2024 08:54:15 +0000 (17:54 +0900)]
Revert "[Tizen] Support asan build option"
This reverts commit
31f497cc81cfc7f26288969907ada8bd06e93f6f.
jykeon [Tue, 18 Jun 2024 08:54:09 +0000 (17:54 +0900)]
Revert "[Tizen] Fix VOA crash issue"
This reverts commit
e7d29e2a1791580b5d41be8a5ad2793654e0a754.
Eunki Hong [Tue, 18 Jun 2024 08:28:54 +0000 (08:28 +0000)]
Merge "(CanvasView) Support rasterization request manually" into devel/master
joogab yun [Tue, 18 Jun 2024 07:33:22 +0000 (07:33 +0000)]
Merge "Binding IsGeometryHittestEnabled()" into devel/master
Eunki, Hong [Tue, 18 Jun 2024 04:01:00 +0000 (13:01 +0900)]
(CanvasView) Support rasterization request manually
Change-Id: I1754a846cd9e4382cab6898c3f362e530fec6485
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>
Adam Bialogonski [Fri, 14 Jun 2024 08:32:53 +0000 (09:32 +0100)]
DALi Version 2.3.28
Change-Id: I41e587f6251b2697f2a501c1f16f8a295972f7dc
joogab.yun [Tue, 14 May 2024 05:23:11 +0000 (14:23 +0900)]
Binding IsGeometryHittestEnabled()
Binding HandEvent and CancelAllOtherGestureDetectors api
Change-Id: I890624c408bd15e0ca2c585c456544cca080b782
Hosang Kim [Tue, 11 Jun 2024 08:13:39 +0000 (17:13 +0900)]
[Tizen] Fix VOA crash issue
This reverts commit
648c796b8396ff6733a067b7b9f820ba28cb0952.
Hosang Kim [Tue, 11 Jun 2024 08:12:54 +0000 (17:12 +0900)]
[Tizen] Support asan build option
This reverts commit
ff7cc546903fcf6c4c19fa22a67dd7cf6530419a.
Hosang Kim [Tue, 11 Jun 2024 08:12:42 +0000 (17:12 +0900)]
Merge branch 'devel/master' into tizen
Hosang Kim [Tue, 11 Jun 2024 08:12:39 +0000 (17:12 +0900)]
Revert "[Tizen] Support asan build option"
This reverts commit
e3e19baf43e205a3dad01063faeecd0da8026700.
Hosang Kim [Tue, 11 Jun 2024 08:12:30 +0000 (17:12 +0900)]
Revert "[Tizen] Add PropertyMap Insert APIs"
This reverts commit
3136f986cd6edab178df72748e6556f2a2079066.
Hosang Kim [Tue, 11 Jun 2024 08:12:23 +0000 (17:12 +0900)]
Revert "[Tizen] Update PropertyMap SetValue APIs"
This reverts commit
7bf0574f9bc873a0928c4dd66389e5276705a41f.
Hosang Kim [Tue, 11 Jun 2024 08:12:14 +0000 (17:12 +0900)]
Revert "[Tizen] Add Vd option for rive-tizen"
This reverts commit
1b0ef9332bd1c7a899bfa3db63631449a5ba37a4.
Hosang Kim [Tue, 11 Jun 2024 08:12:04 +0000 (17:12 +0900)]
Revert "[Tizen] Fix VOA crash issue"
This reverts commit
b6184bc7fdfe0b1d5397393eb043f9b826f0e962.
Adeel Kazmi [Fri, 7 Jun 2024 17:26:26 +0000 (18:26 +0100)]
DALi Version 2.3.27
Change-Id: I84c230eac84b290aa0297e2379dc021ccd0cfa1f
dongsug.song [Wed, 5 Jun 2024 08:28:01 +0000 (17:28 +0900)]
[Tizen] Fix VOA crash issue
Change-Id: Ifc4daf764efebb04fdc153a3b65fc38c97618cf6
huiyu eun [Tue, 4 Jun 2024 10:18:16 +0000 (10:18 +0000)]
Merge "Add Vd option for rive-tizen" into devel/master
huiyu.eun [Tue, 4 Jun 2024 07:54:17 +0000 (16:54 +0900)]
[Tizen] Add Vd option for rive-tizen
Change-Id: I9c135b051afe252c14b4b8973d1c70c88522cbe8
Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>
huiyu.eun [Tue, 4 Jun 2024 07:54:17 +0000 (16:54 +0900)]
Add Vd option for rive-tizen
Change-Id: I9c135b051afe252c14b4b8973d1c70c88522cbe8
Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>
Eunki, Hong [Tue, 16 Apr 2024 07:41:58 +0000 (16:41 +0900)]
Implement Visual control logic for NUI
Let we implement NUI specific Visual policy.
1. Let we allow to set visual as BaseHandle class.
2. Allow to change the property of visual
- Previous implements only able to change the PropertyMap.
This concept is not matched with C# standard coding rule.
Thus, we need to make a class, that keep whole properties at C# side.
3. Allow to change the order of rendering order.
- For limitation ; We allow this visual only used between Background and Contents.
4. Do not allow to make AnimatedImageVisual if we don't use Animated flags
Change-Id: I47940c91ed853b83235119e16221aea1b27087c5
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>
huiyu eun [Mon, 3 Jun 2024 05:59:10 +0000 (05:59 +0000)]
Merge "Add dali2-csharp-binder link" into devel/master
Bowon Ryu [Mon, 13 May 2024 04:23:00 +0000 (13:23 +0900)]
Add SetInputPanelPositionAlign
Change-Id: I15291f759d65926efcde327edb20b093b698c2ac
Signed-off-by: Bowon Ryu <bowon.ryu@samsung.com>
Adeel Kazmi [Fri, 31 May 2024 10:52:26 +0000 (10:52 +0000)]
Merge "DALi Version 2.3.26" into devel/master
Adeel Kazmi [Fri, 31 May 2024 10:45:50 +0000 (11:45 +0100)]
DALi Version 2.3.26
Change-Id: Icc0d0f1a686580ea439bcfc99b2a1c610fbd777b
Eunki Hong [Fri, 31 May 2024 01:30:38 +0000 (01:30 +0000)]
Merge "Revert remove of CSharp_Dali_Layer_SetClippingBox__SWIG_0" into devel/master
joogab.yun [Fri, 31 May 2024 00:44:00 +0000 (09:44 +0900)]
Fix memory leak
Fix memory leak which returns new Vector and the returned Vector is used
as follows in NUI.
global::System.IntPtr cPtr = func(SwigCPtr);
new Vector2(cPtr, false);
refer
https://review.tizen.org/gerrit/#/c/platform/core/uifw/dali-csharp-binder/+/311930/
Change-Id: I91b6956b32bf8eed5dc7d8f09aa24afbaa485c5c
Seungkeun [Thu, 30 May 2024 08:10:17 +0000 (17:10 +0900)]
Revert remove of CSharp_Dali_Layer_SetClippingBox__SWIG_0
Change-Id: I2cf30ac558b70b07196dd6e6c81598a2cdf6c170
huiyu.eun [Thu, 30 May 2024 07:42:01 +0000 (16:42 +0900)]
Add dali2-csharp-binder link
Change-Id: I570ad6ae57bc3e00e854f65ee9f21572d8a7265b
Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>
Richard Huang [Fri, 24 May 2024 11:33:37 +0000 (12:33 +0100)]
DALi Version 2.3.25
Change-Id: I283e7dbfe6f55406a9cfc0eff0f56b86f737e14d
Eunki Hong [Tue, 21 May 2024 02:22:03 +0000 (02:22 +0000)]
Merge changes I55444687,Id27b3db1 into devel/master
* changes:
[Tizen] Update PropertyMap SetValue APIs
[Tizen] Add PropertyMap Insert APIs
Eunki, Hong [Mon, 20 May 2024 05:24:26 +0000 (14:24 +0900)]
[Tizen] Update PropertyMap SetValue APIs
This reverts commit
6122b5e391bcf4b6968877649b81307b605a8284.
Change-Id: I77c10deac632213ae0103b8ef9b0e65adbf5016d
Eunki, Hong [Mon, 20 May 2024 05:24:16 +0000 (14:24 +0900)]
[Tizen] Add PropertyMap Insert APIs
This reverts commit
c7aadb982f67194875fe5e5d48e6a7a4fea083a5.
Change-Id: I23a22561daa053d6e62ba6259f817ab3b0f4f25e
Eunki, Hong [Mon, 20 May 2024 05:24:04 +0000 (14:24 +0900)]
[Tizen] Support asan build option
This reverts commit
2cfea95ba9c302df3f439ac6bfb4f2bc5574c8e9.
Change-Id: I0fb07c793c8bb8b035287e995ff9975e901fbef1
Eunki, Hong [Mon, 20 May 2024 05:23:22 +0000 (14:23 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: Ic281c4c0dbf47b0400229054a95ebbc30876b7cb
Eunki, Hong [Mon, 20 May 2024 05:23:18 +0000 (14:23 +0900)]
Revert "[Tizen] Support asan build option"
This reverts commit
7f4e7dee7e7d4108ff5c4db2e02197166a6c18ac.
Eunki, Hong [Mon, 20 May 2024 05:23:16 +0000 (14:23 +0900)]
Revert "[Tizen] Add PropertyMap Insert APIs"
This reverts commit
9a4d5f0df09f6a3f746b430894e05ac5e05f6e8c.
Eunki, Hong [Mon, 20 May 2024 05:23:14 +0000 (14:23 +0900)]
Revert "[Tizen] Update PropertyMap SetValue APIs"
This reverts commit
25f54beebf1b1beb4c2cb758e96232005369606b.
Eunki Hong [Mon, 20 May 2024 04:31:53 +0000 (04:31 +0000)]
Merge "Bind ID value of Animation + Bind more API for RenderTask" into devel/master
sunghyun kim [Mon, 20 May 2024 01:22:13 +0000 (01:22 +0000)]
Merge "Add TRANSITION_EFFECT_OPTION for replacing image" into devel/master
Eunki Hong [Sun, 19 May 2024 12:30:39 +0000 (21:30 +0900)]
Bind ID value of Animation + Bind more API for RenderTask
Let we bind some API that we added recently.
Change-Id: I40bb246439f719fafffc90b8394a30ec4e9c1348
Signed-off-by: Eunki Hong <eunkiki.hong@samsung.com>
David Steele [Fri, 17 May 2024 11:11:22 +0000 (12:11 +0100)]
DALi Version 2.3.24
Change-Id: Icc8f3586c829f3e07618d52dbc5b0517e79e7f15
Chihun Jeong [Tue, 14 May 2024 07:26:47 +0000 (07:26 +0000)]
Merge "Bind CUTOUT property" into devel/master
Seungho Baek [Mon, 13 May 2024 05:24:12 +0000 (14:24 +0900)]
[Tizen] Update PropertyMap SetValue APIs
This reverts commit
0df013df545a4d60c79070ad5a490cc66a0b3112.
Change-Id: I560a4a98109f624a210b1dd4c5a6c62490c31fab
Seungho Baek [Mon, 13 May 2024 05:23:30 +0000 (14:23 +0900)]
[Tizen] Add PropertyMap Insert APIs
This reverts commit
b468ad61371ca4a1ac3734841d62f596c148952e.
Change-Id: I9f050539844ca9e96c680164885f8f281ab701ac
Seungho Baek [Mon, 13 May 2024 05:23:05 +0000 (14:23 +0900)]
[Tizen] Support asan build option
This reverts commit
c166c54f3effd516f6b39f33f8c718c2c33099a1.
Change-Id: I5ba6486ffd15447f73f70d56906f2c0772eaf325
Seungho Baek [Mon, 13 May 2024 05:22:52 +0000 (14:22 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: Ib71b3d6e2ba998fbc1c73b95b580aa2f3c2d42a8
Seungho Baek [Mon, 13 May 2024 05:22:39 +0000 (14:22 +0900)]
Revert "[Tizen] Support asan build option"
This reverts commit
5290aaf92dcb774cd2c746d5a744081b8fb5b2ea.
Seungho Baek [Mon, 13 May 2024 05:22:36 +0000 (14:22 +0900)]
Revert "[Tizen] Add PropertyMap Insert APIs"
This reverts commit
143b7ec31b348a6568183f76f12a95401bf06c3d.
Seungho Baek [Mon, 13 May 2024 05:22:34 +0000 (14:22 +0900)]
Revert "[Tizen] Update PropertyMap SetValue APIs"
This reverts commit
3bff72513aa82691ab69bcd24ad7d260ca4d1bbe.
Adeel Kazmi [Fri, 10 May 2024 10:02:37 +0000 (11:02 +0100)]
DALi Version 2.3.23
Change-Id: I2c9eef8455430a8db605df4099fa326665507bb0
sunghyun kim [Thu, 9 May 2024 05:37:34 +0000 (14:37 +0900)]
Add TRANSITION_EFFECT_OPTION for replacing image
Change-Id: I0fdc0adfda8ba552fc9d890e688c6bab924361a3
Adeel Kazmi [Fri, 3 May 2024 09:07:39 +0000 (09:07 +0000)]
Merge "DALi Version 2.3.22" into devel/master
Adam Bialogonski [Fri, 3 May 2024 08:27:04 +0000 (09:27 +0100)]
DALi Version 2.3.22
Change-Id: Ie6c559039f149f54aae28b9d5dde38ab0ae6095a