Extension:MobileFrontend/Deployments/2013-06-25
Stories
edit* https://mingle.corp.wikimedia.org/projects/mobile/cards/837 * Promote copyvio nag to stable
* https://mingle.corp.wikimedia.org/projects/mobile/cards/434 * Beta: Infinite scroll on uploads
* https://mingle.corp.wikimedia.org/projects/mobile/cards/488 * Beta: Add pageimages to search
* https://mingle.corp.wikimedia.org/projects/mobile/cards/820 * [spike] Investigate upload errors
Bugs
edit* https://bugzilla.wikimedia.org/show_bug.cgi?id=50133 * Make Nearby on Commons search NS_FILE namespace
* https://bugzilla.wikimedia.org/show_bug.cgi?id=49209 * Cannot handle opening two CTA's
* https://bugzilla.wikimedia.org/show_bug.cgi?id=49771 * Zoom is triggered when focusing inputs
* https://bugzilla.wikimedia.org/show_bug.cgi?id=49215 * Editing pages without a lead section
* https://bugzilla.wikimedia.org/show_bug.cgi?id=49544 * Upload errors due to bad filenames
* https://bugzilla.wikimedia.org/show_bug.cgi?id=49780 * "Read in another language" button has an extraneous word in it
* https://bugzilla.wikimedia.org/show_bug.cgi?id=49606 * Adding a special page named Special:Uploads is confusing given Special:Upload already exists
* https://bugzilla.wikimedia.org/show_bug.cgi?id=49557 * Adding talk topic doesn't invalidate local browser cache
Uncategorized
edit* Update CSS file * Fix blurry text effect on Chrome * Make info boxes float to the right on a tablet display * Accept linux font alternatives to Helvetica * Reinstate WMLsupport for Wikipedia Zero * Localization changes * Don't register module "mobile.device" * Prevent uploading of anything other than images * Don't allow consecutive apostrophes * Don't try to scroll the page after loading * Bug hijack all links on the first load * Update javascript template to reflect PHP changes * Remove unnecessary suggestions-result class * Remove unused vars * Feature Setting user agents * Updated Ruby gems * Refactor template code * Remove unused data parameter * Separate page-actions from #content * Don't load Hogan twice * Rewrite parts of the uploads dashboard code * Fix navigate to link in android * Regression hide button bar in editor when keyboard visible * Regression make diff user infobox position fixed again * Make editing work on pages other than main namespace * Merge SkinMobileBase into SkinMobile * Fixed link to mobile homepage * Remove Zero banner remnants * Make editor disappear after successful save * Center left and right arrows on uploades for first time user * Remove progress indicator * New assets first time user upload tutorial * Photo reorganization * Remove scrollTo call * Get partial result from the API *
Git Log
editcommit b7475d531105f1737a219475d26e4692e12f8866 Author: Juliusz Gonera <jgonera@wikimedia.org> Date: Mon Jun 24 17:13:31 2013 -0700
Update CSS file Didn't run make less, apparently block level comments are copied from LESS files. Change-Id: I188c59a31803e4cbd62a5ae4f6949a4895bc134f
commit 1761974d15c5250176f3bb8480c9da85123edf1b Author: jrobson <jrobson@wikimedia.org> Date: Mon Jun 24 16:54:15 2013 -0700
Bug 50133: Allow Nearby to be configured to different namespaces Will allow us to enable Nearby on Commons Change-Id: Ia9b3bf27a397cb0365d3b7681f0c22818a74f61b
commit db05bf040791c4b5b5c3bc9a56d6cb44679c8365 Author: Juliusz Gonera <jgonera@wikimedia.org> Date: Fri Jun 21 17:51:58 2013 -0700
Reduce blurry text effect when animations are enabled on Chrome If you are logged out and there is a hidden CTA drawer present, article text looks blurry. This commit reduces it. Change-Id: I9e63a12af40b9c067a19ce5578380523d70071ca
commit 151ae4cc27fe2445f9d712deb2ffc5e8f6b177ab Author: Juliusz Gonera <jgonera@wikimedia.org> Date: Mon Jun 24 14:55:30 2013 -0700
Hide a drawer when another drawer is shown Bug: 49209 Change-Id: I8b32c2f559b5a380b681a548d9196c5ffef60835
commit e53eee64d290e35b26a85180ad2603ab086f7968 Author: jrobson <jrobson@wikimedia.org> Date: Thu Jun 20 18:00:10 2013 -0700
Bug 49771: Prevent zooming on iOS Giving a font size of at least 16px seems to stop zooming in iOS https://github.com/twitter/bootstrap/issues/2159 Change-Id: I37ea6aefe91e8086468af1f4a564b277663fef19
commit 163ba88347d204108d8253be861a68a3ef47f1ca Author: jrobson <jrobson@wikimedia.org> Date: Fri Jun 21 17:58:12 2013 -0700
Make info boxes float to the right on a tablet display Follow Jared's advice to make infoboxes on wider displays look better. Change-Id: Ib8e258e4b7ac8ff04a5fafd08732531ebc643dc9
commit fe91a50db5b858960f26954aa98b7e036e851374 Author: jrobson <jrobson@wikimedia.org> Date: Mon Jun 24 14:51:03 2013 -0700
Accept Linux font alternatives when Helvetica not available Change-Id: Id43087c2a4c0e50e20f4e8e374bb234279903b0a
commit 2dcdad24925e4ee91d457c591a3e8b3c667a7da3 Author: dr0ptp4kt <abaso@wikimedia.org> Date: Wed Jun 19 16:09:50 2013 -0700
Reinstate WML support for Wikipedia Zero. Change-Id: Ib7004eacb798b4592f0ece07b289710cb8f7940c
commit 3bf0c53c15ae7752a1262c8998c758a0c281ed0b Author: Translation updater bot <l10n-bot@translatewiki.net> Date: Mon Jun 24 19:55:52 2013 +0000
Localisation updates from http://translatewiki.net. Change-Id: Ic1cb418d4accc1a92d803baa9a24fa5333744202
commit 2ca8cd900f6eef839f669d2b14e8d020a4abbd32 Author: Max Semenik <maxsem.wiki@gmail.com> Date: Fri Jun 21 03:06:36 2013 +0400
Don't register module called "mobile.device." Change-Id: I7569088b2d0d55e11700afcc2c49f76727580df2
commit 78c63639bb356303e9d9c04ee3f7207d00e22beb Author: jrobson <jrobson@wikimedia.org> Date: Mon Jun 24 11:15:56 2013 -0700
Prevent uploading of anything other than images Wait for the preview image to load. If it fails to do so assume a bad filetype has been given. Change-Id: I4a3404380524ae6b16d431024d706e0089ae0258
commit 52c3e508c01a6dc97e0524ff43d88fa7d85bf0ac Author: Juliusz Gonera <jgonera@wikimedia.org> Date: Mon Jun 24 11:19:24 2013 -0700
Open first section in editor when lead section empty Bug: 49215 Change-Id: Ife7ced8cdb7ee70c5801b380f81044122ec481cc
commit e2b486fb17980768a722790152e997296b115334 Author: jrobson <jrobson@wikimedia.org> Date: Mon Jun 24 11:03:23 2013 -0700
Bug 49544: Allow margin of error in filename generation In exploring these seems like it could be the main cause of bug 49544 Bug: 49544 Change-Id: Ib1a9fe3bf9db732f00268a2f84733755f4bf1f76
commit 5692469609b369134e85f2d7e895869e4480d14f Author: jrobson <jrobson@wikimedia.org> Date: Mon Jun 24 10:44:02 2013 -0700
Don't allow consecutive apostrophes Turn them into '_ Change-Id: Id5625e262dc7e97fe8c5debe1401f1a509132034
commit 55d8a832abb854ed62c30a8d5c2ab4865878f2df Author: jrobson <jrobson@wikimedia.org> Date: Mon Jun 24 10:38:48 2013 -0700
When receive bad file name errors print filename in error response Related to bug 49544 Wrap in brackets to tell where the error string has been truncated Change-Id: I50609bd2fccdefc1d3999d0aa82cbee56ec61975
commit 3f531916a7fb49fe445cb1bbe91859af050c6813 Author: Translation updater bot <l10n-bot@translatewiki.net> Date: Sun Jun 23 20:25:13 2013 +0000
Localisation updates from http://translatewiki.net. Change-Id: I20f5cfa198a3a75664c04220db3f00a65d0f0c7f
commit 9ddd65da2b473aa2eeaf419d48bb69e62fad23c6 Author: Translation updater bot <l10n-bot@translatewiki.net> Date: Sat Jun 22 21:28:50 2013 +0000
Localisation updates from http://translatewiki.net. Change-Id: I9a5655aeeda2bff0aff562968951ed0beb262fe0
commit 52458b6786c66f77c996b99671e4c809828bfc7e Author: Juliusz Gonera <jgonera@wikimedia.org> Date: Fri Jun 21 17:59:10 2013 -0700
Don't try to scroll the page after loading to hide URL bar This possibly confuses users, as it is triggered with a delay, when mf-application.js is loaded (looks as if the page jumped at a random moment). Change-Id: If384bc8eff52d70a63149a325de49b2ba68d44d7
commit e9264a2a993cd822712ebba2bc03be03beb707af Author: Juliusz Gonera <jgonera@wikimedia.org> Date: Fri Jun 21 15:48:33 2013 -0700
Story 837: Promote copyvio nag to stable Change-Id: If8ce35df0e4c91736674945eb89a12451535df80
commit 4d63c2cdf96f20102626b074fc284f9e43fd9f36 Author: Translation updater bot <l10n-bot@translatewiki.net> Date: Fri Jun 21 20:24:19 2013 +0000
Localisation updates from http://translatewiki.net. Change-Id: I989345981c08ba8b479e96ee3647d7b14fcbb192
commit bf00b07914da64505fe36dafa4bbb2ea200ee445 Author: jrobson <jrobson@wikimedia.org> Date: Thu Jun 20 17:48:05 2013 -0700
Bug: Hijack all links on the first load Hijack links inside rendered sections on the first load not just the lead section Change-Id: I1e0b1d2e7b0f74b2c81c60a34ab0e07fd1043dde
commit 27342c86c0ebade256dd6a7ae3b5f3860869974c Author: jrobson <jrobson@wikimedia.org> Date: Thu Jun 20 12:21:53 2013 -0700
Update javascript template to reflect changes in PHP When saving the page renders with two navigation bars without this Fixing Bug 44130 would have helped with this. Change-Id: I742eb3587f3736a9c1932bc86ee59c4fe26ca434
commit 3aea31c91267f1018f0b2930b3626324ffd9228d Author: Juliusz Gonera <jgonera@wikimedia.org> Date: Mon Jun 17 14:56:09 2013 -0700
Story 434: Add infinite scroll to uploads dashboard A spinner image is shown at the bottom until all images are loaded. When scrolling, when the viewport is 1000px or less from the spinner, more images are requested. A followup with bookmarkable URLs possible in future. Change-Id: Ifb7116cee3bb22a52dbe7329c0a7563ca44833bc
commit a971fa1dec3da13d6a1553cbbb03092d626a64a8 Author: jrobson <jrobson@wikimedia.org> Date: Thu Jun 20 16:48:39 2013 -0700
Bug 49780: Remove edit from read another language Change-Id: Ia75b37404ca39beb9214bb3f10eec1efe078f7df
commit 493367264aca259ca5fec4afcf5c13a5c2b02442 Author: jrobson <jrobson@wikimedia.org> Date: Thu Jun 20 16:39:53 2013 -0700
Hygiene: Remove unnecessary suggestions-result class Change-Id: I4e442c885e03889bfd412f75226d706017080c02
commit 96cb3c522ebfe884b11ddad2f38989211b640325 Author: jrobson <jrobson@wikimedia.org> Date: Thu Jun 6 16:03:10 2013 -0700
Story 488: Add pageimages to search results (beta) Also includes new styling in stable for search error On search results list add page images to the left of search results in beta. Update stable to use same markup. Associated changes: * Remove lots of dead code * Rename mw-mf-watchlist-results class to more generic .page-list and apply to nearby and watchlist views * Make search results use articleList template Change-Id: I938c8cf9448ed510bbf88c7d042193dcd35a7d8e
commit eb1cb675edfb59345ff681475297a9a52ccc3b85 Author: Max Semenik <maxsem.wiki@gmail.com> Date: Fri Jun 21 03:13:21 2013 +0400
Don't register device modules if not needed Change-Id: I96143dc861dfeb8458b87495d6b780cf80209050
commit 74e5a0c31ea1014f88e1d6e8dfd619a81be860bb Author: MaxSem <maxsem.wiki@gmail.com> Date: Thu Jun 20 19:33:42 2013 +0000
Revert "Force index to avoid filesort in feed query" This reverts commit 87e6622714c02d264d7032e9d2062fd192ca3156 Change-Id: Ic882348c075f476419065c99fa5cea4c85c055eb
commit 3444f31a785c3286d5946313f38b05fec3728e1e Author: Translation updater bot <l10n-bot@translatewiki.net> Date: Thu Jun 20 18:59:13 2013 +0000
Localisation updates from http://translatewiki.net. Change-Id: I7606152666f66e3f8f071d6402568e331e4248fe
commit 88e78f9c4e6afdb86b952b615a2b2e7c4294902b Author: Michelle Grover <jcmish1@gmail.com> Date: Fri May 17 09:29:38 2013 -0600
Feature: Setting User Agents Opera Mini and Android 4.0.3. Change-Id: Ibfffd98be98f1f8f3641eb003e9394da9452be72
commit 466d1c9defe77eaa8fdb706283d4f2a68882259f Author: Zeljko Filipin <zeljko.filipin@gmail.com> Date: Thu Jun 20 11:57:02 2013 +0200
Updated Ruby gems Change-Id: I2251dd0cc2f4e34cff5b2f265f2d4ea84e6078d1
commit 6c0234753cd4f7568c83d2d4a5026c8e736c7cdd Author: Max Semenik <maxsem.wiki@gmail.com> Date: Thu Jun 20 00:54:25 2013 +0400
Hygiene: Rm unused vars Change-Id: Ib091b060bf03b2305ea65194569531dfb22f62eb
commit 419fdf56caca3941c7bfc0eaa4f4695c5772c980 Author: jrobson <jrobson@wikimedia.org> Date: Wed Jun 19 15:21:25 2013 -0700
Hygiene: Remove unused data parameter Change-Id: Ib829b60f9954bae77f4e7b29199d53809b16a7f6
commit 1170f0613b69ef3b5cfbdd08c17373a0446a23a3 Author: jrobson <jrobson@wikimedia.org> Date: Fri Jun 14 12:24:23 2013 -0700
Separate page-actions from #content Wikipedia admins should be able to style content safely without interfering with the ui (see https://en.m.wikipedia.org/w/index.php?title=MediaWiki_talk:Common.css&oldid=559614143) Introduce MobileTemplateBeta.php to give better separation of our beta and stable code Change-Id: I87883d223e4ee99d4d457857a0ccbbeb426f0f42
commit b15265adf4b36c289772dbb87a5442a18b70fe9b Author: jrobson <jrobson@wikimedia.org> Date: Fri Jun 14 12:11:35 2013 -0700
Refactor template code Break out renderContentWrapper Move language data construction to inside render languages Change-Id: Ib31934be8db86a66070f77c27e9993163c89a3b5
commit 822c7e9791fb56c882bfe3f8b487bba36ef8b35e Author: Juliusz Gonera <jgonera@wikimedia.org> Date: Wed Jun 19 15:02:50 2013 -0700
Don't load Hogan twice This slipped in somehow and is wasting bandwidth. Change-Id: I48b8f958f9851d1786f60a745a454308401329ec
commit f706047f4009abd5c3a3a1014a3f4f100bcf9920 Author: Juliusz Gonera <jgonera@wikimedia.org> Date: Mon Jun 17 11:07:15 2013 -0700
Rewrite parts of the uploads dashboard code Create UserGalleryApi which inherits from Api, untangle carousel code (remove the module-global carousel variable). Change-Id: I15723385d0acce2c3b96511270f74cee34f790f9
commit 13e6057d72d0ff7895ae47a52d40527423aac4ef Author: Translation updater bot <l10n-bot@translatewiki.net> Date: Wed Jun 19 20:38:10 2013 +0000
Localisation updates from http://translatewiki.net. Change-Id: I054dc079e5a0bc77c4b2bdd5c60942cba8f141c1
commit 4f15f67efc33e9b5092a16408603254c7e18201d Author: Juliusz Gonera <jgonera@wikimedia.org> Date: Tue Jun 11 17:12:42 2013 -0700
Clean up uploads dashboard code Remove placeholder code as it seems to have been replaced by a carousel overlay completely + other small tweaks. Change-Id: If36a642ca291c3e759fbb3ddbc8641cbda5875a3
commit 317aa9ea9c5256ad1c47fb37b077628233c6a282 Author: jrobson <jrobson@wikimedia.org> Date: Tue Jun 18 13:59:45 2013 -0700
Fix navigate to link in Android Change-Id: Icc7abcb0b25a81e7a460b86704fdd52472213ed9
commit 3dc9cf4720cee8d6b94bb64726d7fa955d24a839 Author: Juliusz Gonera <jgonera@wikimedia.org> Date: Tue Jun 18 13:47:55 2013 -0700
Regression: hide button bar in editor when keyboard visible Change-Id: I365de11f34ec8fef67cb91899f6245df0d9a28a9
commit 91217665106e0ae099a903a79fad7900f2f76073 Author: jrobson <jrobson@wikimedia.org> Date: Tue Jun 18 13:39:06 2013 -0700
Regression: Don't attempt to hijack links in special pages Currently breaks the Watchlist feed view Change-Id: I9f8f7b7e2716d2576405fad7b375c8d2e85916c0
commit 81d2dde21f32eed58a0ac9c452af2a8fbd759ca7 Author: jrobson <jrobson@wikimedia.org> Date: Tue Jun 18 13:33:33 2013 -0700
Regression: Make diff user info box position fixed again Change-Id: I0487e14d5060c804e7191a30f26566e1a3bf1f1d
commit 41eb1d60e83c31baabf976a04a4aba45ee18b9b1 Author: Translation updater bot <l10n-bot@translatewiki.net> Date: Tue Jun 18 20:26:29 2013 +0000
Localisation updates from http://translatewiki.net. Change-Id: Ie8e87f76ceb91fbbfd522d07d3b81eb46a4d7dcb
commit 161959893bbc8719e1238d2733a1f43091c8deb3 Author: jrobson <jrobson@wikimedia.org> Date: Tue Jun 18 12:24:26 2013 -0700
Make editing work on pages other than main namespace Currently the editor loads the main namespace when you click edit on a talk page. doh! Change-Id: I87b4a783dff689dc4d524649b6d09e152e05fb94
commit a206cd1343fb2b0e19103fffa948112b685a3fe5 Author: Max Semenik <maxsem.wiki@gmail.com> Date: Tue Jun 18 04:17:24 2013 +0400
Merge SkinMobileBase into SkinMobile Change-Id: I59649f4e856febf867c31131b46b9dcdfb9c140f
commit 75b543e30c30c9fc103e1c24c83825cccd2c8cd5 Author: Yuri Astrakhan <yurik@wikimedia.org> Date: Tue Jun 18 02:29:38 2013 -0400
Fixed link to mobile homepage Change-Id: Ibe2c001cd1f979337c9e7db90273e179f4c84070
commit 94bd659befd8e07d45447b2853e4283eaf230370 Author: Max Semenik <maxsem.wiki@gmail.com> Date: Sat Jun 8 02:38:55 2013 +0400
Remove Zero banner cruft Rely on GetMobileNotice hook for it instead Change-Id: Ia7ede9c5b782db6e9b7dbf23952e939cc18a7cc8
commit d8f89e298583060f6fee79e65947e089c91dec87 Author: Juliusz Gonera <jgonera@wikimedia.org> Date: Fri Jun 14 12:02:11 2013 -0700
Make editor disappear after a successful save After changing the back button behavior, the editor would reappear after saving an edit. This prevents it. Also make Router use an object for routes so that subsequent Router#route() calls don't add duplicate entries. Change-Id: I85c3613c789f65883b7ad470d15571a11b0b14d0
commit fabcb25eead8cef66f0bc29f7d311d7610c7c45d Author: jrobson <jrobson@wikimedia.org> Date: Mon Jun 10 12:46:21 2013 -0700
Spike 820: Reduce API errors related to anonymous tokens (hopefully) When wgMFUseCentralAuthToken is enabled ask for centralauth tokens to avoid not logged in on foreign wiki issues Change-Id: Iada82266e0108189a727c39dad9e32c6cc1c120c
commit 8ebb0dc5aedda2efe9dec244a24fc418c0ff9782 Author: jrobson <jrobson@wikimedia.org> Date: Mon Jun 17 14:41:31 2013 -0700
Center left and right arrows on uploads first time user tutorial Change-Id: Ib0120cb2a3cb70069b11559b1d69b2a36ed21358
commit e797e87b8ece0c17fe1001415517583bf62e5f15 Author: jrobson <jrobson@wikimedia.org> Date: Mon Jun 17 14:38:22 2013 -0700
Uploads page: remove out the progress indicator Change-Id: I75018f2edeb902818b8a253d1e726569f9a39760
commit bbc9743782edbaae4b08a851502c9a5bd07be052 Author: jrobson <jrobson@wikimedia.org> Date: Mon Jun 17 13:59:49 2013 -0700
New assets for first time user upload tutorial Change-Id: Iade80e9edee7732e3665fc320c39d5472586ec82
commit e5d4c1455de0c8aeeed2e9e5cdbc579ea2747dae Author: jrobson <jrobson@wikimedia.org> Date: Mon Jun 17 12:01:37 2013 -0700
Only add Uploads page in mobile mode This should avoid confusion being caused in Bug 49606 Left a FIXME to revisit at future time. Change-Id: Ib80615d678af477bfb57908b75bec8c121df02af
commit c23212ae46816f9f6a2292ee3fdda08688664692 Author: jrobson <jrobson@wikimedia.org> Date: Mon Jun 17 11:38:22 2013 -0700
Big photo reorganisation Rename mf-photo.js to leadphoto.js Move tests around Fixes bug 49658 in process (However since overlays do not yet work in vector the page still looks broken - see later commit) Change-Id: Ie719bd3de122e0fbc2fdbbf6d37a4f33f81a78e8
commit 69a516e7fb958ff0eab5765974beeae85925fb05 Author: Translation updater bot <l10n-bot@translatewiki.net> Date: Mon Jun 17 21:26:23 2013 +0000
Localisation updates from http://translatewiki.net. Change-Id: I22163bd0f5edc26af42193290179b2f2b0badced
commit 2fb4e17ce989c351e9c6f0edaafffe2a550de9ff Author: jrobson <jrobson@wikimedia.org> Date: Mon Jun 17 11:33:48 2013 -0700
Remove scrollTo call Doesn't seem to serve a purpose Breaks in other skins which don't have a .header element (e.g. vector) Change-Id: I237b34a04e7d544d9056d8040d7108bbbf687aa8
commit 341809ac9e93cfd79d7a91aeddb4133b9059b1c6 Author: Translation updater bot <l10n-bot@translatewiki.net> Date: Sun Jun 16 20:43:54 2013 +0000
Localisation updates from http://translatewiki.net. Change-Id: I0a6cc97b7c13bd4145c38b3c6120715c6cf80ee7
commit 7856b636d144a6cf6c8496621d7609cd142222ad Author: Translation updater bot <l10n-bot@translatewiki.net> Date: Sat Jun 15 21:11:10 2013 +0000
Localisation updates from http://translatewiki.net. Change-Id: Iee34a58279929495ec8dd2c06aeb8f3c7ee3a164
commit b0106b2111185cee00d5515300f778ad56ac8281 Author: Yuri Astrakhan <yurik@wikimedia.org> Date: Sat Jun 15 15:32:39 2013 -0400
Ability to get partial result from the API * Small memory devices seem to have issues with large JSON blobs. This patch allows clients to request a portion of the text by providing an offset and a maximum length. * All "text" strings are virtually joined together, and only the range after offset and no longer than maxlen is actually returned. * A "continue-offset" value is set if there is more data. Change-Id: Ib71800c1afa057bf87fd652ecb650bc38e33df68
commit 6f6a77db50871e951207bd53f9a9618141eb1f19 Author: Translation updater bot <l10n-bot@translatewiki.net> Date: Fri Jun 14 21:51:20 2013 +0000
Localisation updates from http://translatewiki.net. Change-Id: Ifdfd814bb4397c0b9858e9d24cf081938753fd44
commit c3e24c916302337908b728d09643183872e6e68a Author: jrobson <jrobson@wikimedia.org> Date: Fri Jun 14 14:38:32 2013 -0700
Bug 49557: Fix talk topic add overlay * Run _super to ensure that parent is opened on a close * invalidate cache so that when the talk button is clicked on again it loads the new talk page content * Hide the button bar when save is clicked to prevent duplicate edits with the same content Change-Id: I6775efa41e098c015af30c63c68af8f66f58fc0f