- May 22, 2024
-
-
Sascha Egerer authored
`\TYPO3\CMS\Extbase\Persistence\Generic\Query::execute()` has a boolean flag to define if the result should be a raw result without data mapping to an object. In this case a raw array is returned and not an array with objects. The annotation has been fixed at several places to be in sync with underlying \Doctrine\DBAL\Result::fetchAllAssociative() return type. Resolves: #103874 Releases: main, 12.4 Change-Id: Iea3eda9e805ca064d290f088d6130a44c06c1a42 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84343 Tested-by:
core-ci <typo3@b13.com> Tested-by:
Anja Leichsenring <aleichsenring@ab-softlab.de> Reviewed-by:
Christian Kuhn <lolli@schwarzbu.ch> Reviewed-by:
-
Stefan Bürk authored
This change adds some tests for the `EXT:backend` ThumbnailViewHelper, mainly to cover fix #102571. Resolves: #103846 Related: #102571 Releases: main, 12.4 Change-Id: Id1acf6ddf6bc68c2dff0bfb7875859e07768e2af Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84283 Tested-by:
-
Christian Kuhn authored
Shuffle the permutations of php, dbms, composer/non-composer sets/sys_template and locked/min/max for ac tests around to reduce job count and still catch lots of different combinations. Resolves: #103876 Related: #103869 Releases: main Change-Id: I5b2082f59f2890afd02890aaf2a2622ebcd09401 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84345 Tested-by:
Stefan Bürk <stefan@buerk.tech> Reviewed-by:
-
Benjamin Franzke authored
The cache identifier of TSCconfig strings is now hashed with the current TYPO3 version number in preparation for an upcoming cache-content change (#79737) which is to be included in an upcoming v12 release. Resolves: #103839 Related: #79737 Releases: main, 12.4 Change-Id: I0864deddc350c6775c5cfe42fc05cfa1b974050e Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84279 Reviewed-by:
Andreas Kienast <a.fernandez@scripting-base.de> Tested-by:
-
- May 21, 2024
-
-
Ayke Halder authored
Several classes in TYPO3 have class doc comments like `Class NameOfClass`. Those comments have no value and can therefore be removed. RegEx search: `/\*\*(\n \*.*)*\n \* Class [A-Z]` Resolves: #103866 Related: #103862 Releases: main Change-Id: Idb4ea9971d05686edb247cc6c96a03911baa19ae Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84332 Tested-by:
Oliver Klee <typo3-coding@oliverklee.de> Reviewed-by:
Simon Schaufelberger <simonschaufi+typo3@gmail.com> Reviewed-by:
Chris Müller <typo3@brotkrueml.dev> Tested-by:
Torben Hansen <derhansen@gmail.com> Reviewed-by:
-
Stefan Bürk authored
With change #103465 a couple of code integrity checks based on the `nikic/php-parser` have been combined into one file scanning script. The goal is to collect the information per visitor type over all files in a internal visitor state, to output per visitor result after all php file have been scanned. However, the visitor message state is reset for each file with the call of `startProcessing()` method within `AbstractPhpIntegrityChecker`, thus keeping only the result of the last error. This change removes the message reset from the the `startProcessing()` method to keep all error, thus displaying all errors in one go. Resolves: #103868 Related: #103465 Releases: main Change-Id: I96395ff648f39fed7e8216e2c32026a3071a41fe Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84333 Tested-by:
-
Christian Kuhn authored
Less jobs while keeping general pipeline times low. * Simplify runner cache configuration * sqlite pre-merge 3 instead of 5 jobs * sqlite nightly 4 instead of 6 jobs * merge checkIntegrityPhp to general integrity job * merge checkGruntClean to general js job * merge php lint jobs into one * avoid composerInstall for unitJavascript * merge acceptance install jobs into less jobs Note backports are similar but deviate in details. Change-Id: I832543e002824977a98d3ffb35c3d08355b1f5be Resolves: #103869 Releases: main, 12.4, 11.5 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84336 Tested-by:
-
Oliver Bartsch authored
The value of an `label_alt` field might be an array, e.g. for TCA type `select` fields. Those values must not be formatted as this is done by `BU::getProcessedValue()` after resolving the correct record relation. Resolves: #103838 Releases: main, 12.4 Change-Id: Ibfec36d2df94661fde2d82eb60bb2736205d17c3 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84334 Tested-by:
Oliver Bartsch <bo@cedev.de> Reviewed-by: Johannes Schlier Tested-by: Johannes Schlier Tested-by:
-
mogensf authored
The CObjectViewHelper didn't render IMAGE-objects with GIFBUILDER properly. This change avoids the data array in the renderStatic method of the CObjectViewHelper to be null. Resolves: #103863 Related: #102931 Releases: main Change-Id: I7ddbbafbae3d835ecae05c5781e27c633f7441ce Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84320 Reviewed-by:
-
Torben Hansen authored
Several classes in TYPO3 have class doc comments like `Class NameOfClass`. Those comments have no value and can therefore be removed. Resolves: #103862 Releases: main Change-Id: I0824ba6ce03d4faf9c5067f971674816cedb6dd8 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84317 Tested-by:
-
Ayke Halder authored
Use all available CPUs with `Build/Scripts/runTests.sh -s lintPhp`. Note podman CI is configured with a cpu-share to prevent starving other jobs when one is greedy, so this change is ok with CI, too. Resolves: #103864 Related: #103851 Related: #102385 Releases: main, 12.4, 11.5 Change-Id: I1cb7079f119677b36d6f4004398ae24bd8c5d284 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84286 Reviewed-by:
-
- May 20, 2024
-
-
Torben Hansen authored
This change removes a superfluous typecast in `TypoScriptFrontendController`. Additionally, the function's doc comment has been revised and the `@param` comment has been removed, since the function parameter is self-explaining. Resolves: #103859 Releases: main Change-Id: I66bdfbbaf0854bff25a801849b253a607cc122b6 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84313 Tested-by:
-
- May 18, 2024
-
-
Benni Mack authored
With TYPO3 v13.0 the new BeforePageIsRetrievedEvent was added, and the previous hook was removed. This way, it is not possible to manipulate $disableGroupAccessCheck anymore. This change re-adds the possibility to modify this flag in an EventListener. Resolves: #103855 Related: #102806 Releases: main Change-Id: Ic5fbd6c6932b7da5f01592126f1c406d4084103b Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84291 Tested-by:
Rafael Kähm <rafael.kaehm@dkd.de> Tested-by:
Benni Mack <benni@typo3.org> Reviewed-by:
Georg Ringer <georg.ringer@gmail.com> Tested-by:
-
Benni Mack authored
When migrating to TYPO3 v13, the navigation component for rendering the page tree has been renamed with https://review.typo3.org/c/Packages/TYPO3.CMS/+/81411 In TYPO3 v12: - "@typo3/backend/page-tree/page-tree-element" In TYPO3 v13.1: - "@typo3/backend/tree/page-tree-element" This change adds a proper deprecation message, and a RST file for it. Resolves: #103850 Related: #102125 Releases: main Change-Id: I9b704976030e93cbb0632b637b6f099759733ac3 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84285 Tested-by:
-
- May 17, 2024
-
-
Wouter Wolters authored
Use parallel runner to use more than 1 CPU. composer require --dev friendsofphp/php-cs-fixer:^3.57.1 Resolves: #103851 Releases: main, 12.4, 11.5 Change-Id: I59b5e2566a385792cad1b6c11b9b84b63fd21b98 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84284 Tested-by:
-
markuskappe authored
The documentation of EXT:scheduler falsely referred to the Admin Panel extension, which is now corrected. Releases: main, 12.4 Resolves: #103854 Change-Id: I81fe65069bfe0309ba62a5e376e30da4e6f65075 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84288 Reviewed-by:
-
Andreas Kienast authored
This commit fixes an long standing typo in the `dataset` of the delete buttons in the record list. `l10parent` is now correctly named `l10nparent`. Resolves: #103852 Releases: main Change-Id: Ibd2bb8425ef502a9b8ca255a48359b8181222dba Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84287 Reviewed-by:
Willi Wehmeier <wwwehmeier@gmail.com> Tested-by:
-
- May 16, 2024
-
-
Garvin Hicking authored
It has come up a few times that users face problems how to properly utilize the new `_assets/` hashed symlinks for `Resources/Public` assets of extensions. The current ChangeLog entry does not mention key searchwords like `_assets` or `Resources/Public`. Also, vital information is only available on external blog articles. This patch tries to provide a central entry point and may also be ported to the Core-API documentation once the mentioned concepts are approved by the core-team. ChangeLog entries are the vital source of truth for migration instructions and basis for the documentation, thus this is the first place to be addressed. Resolves: #103845 Releases: main, 12.4 Change-Id: Iadeae5de624027b5303a4240b36ca501ae29a31a Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84282 Tested-by:
André Buchmann <andy.schliesser@gmail.com> Reviewed-by:
Nikita Hovratov <nikita.h@live.de> Reviewed-by:
-
Anja Leichsenring authored
With one traverser class and several checkers all necessary checks can be executed within one CI job, which saves time and resources. By feeding all checkers with the same set of files, we can be safe not to lose any files that should be checked. Resolves: #103465 Releases: main Change-Id: I4a2f54c6fac37177c8387a999f5e60102951eba5 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/83568 Reviewed-by:
-
- May 15, 2024
-
-
Nikita Hovratov authored
Resolves: #103835 Releases: main Change-Id: I78159e868390047735490a7d179f90adf3e2e83c Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84276 Tested-by:
-
Stefan Bürk authored
With #103692 remembering the sub-module route within the backend user module has been fixed to open the last opened module sub-route. Due to another splitting of composer acceptance tests, the backend user groups tests are executed before the backend user tests within the same instance - and thus staying on the backend user groups view. `ListUserCest` does not ensure to select the backend user lists like it is done for `ListGroupCest`. This change ensures to switch to the backend users sub-route, when the `backend user` module is selected in the `ListUserCest::_before()` similar to `ListGroupCest::_beore()`. Resolves: #103837 Related: #103692 Releases: main, 12.4 Change-Id: If54812a7bfc95e317f5e72737c3f88461da3fda2 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84278 Tested-by:
Garvin Hicking <gh@faktor-e.de> Reviewed-by:
-
Stefan Froemken authored
Resolves: #103836 Releases: main Change-Id: Ia74ab100142aa29c3a1a145c358e77e4eaaca804 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84277 Reviewed-by:
Lina Wolf <112@linawolf.de> Tested-by:
-
- May 14, 2024
-
-
Benni Mack authored
This new version drops support for PHP 8.0 and below https://github.com/Bacon/BaconQrCode/releases/tag/v3.0.0 Resolves: #103832 Releases: main Change-Id: I80f032e44c3ca8c712166a10f7115e1a38ad7a84 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84233 Tested-by:
Oliver Hader <oliver.hader@typo3.org> Reviewed-by:
-
Andreas Kienast authored
The label for the delete action was encoded twice, leading to text issues in case special characters are involved. This commit makes use of `GeneralUtility::implodeAttributes()` to solve this issue properly. Resolves: #103827 Releases: main, 12.4, 11.5 Change-Id: Ia9f7ba5adf46b470a33b9065e49b8599a24fdfad Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84253 Tested-by:
Benjamin Franzke <ben@bnf.dev> Reviewed-by:
-
Benni Mack authored
This patch consists of three aspects: 1. Record Object (internal) A new value object for records, which contains only the fields relevant for this specific Content Type. It decorates another RawRecord which holds the original raw database record. The RecordInterface, which both implement, allows for unified usage. 2. RecordFactory (internal) The factory for the Record object. Takes the table name and a raw record as input and builds the Record object from it. This class contains three more public methods, which relate to TCA schema. These will be moved to an appropriate place as soon as we have TCA schema at home. 3. RecordTransformationDataProcessor (feature) The actual feature of this patch. The new DataProcessor allows to utilize the Record object inside Fluid templates (only). It can be used in various ways. Most prominent use cases are for chaining the DatabaseQueryProcessor or transforming the current {data} variable of FLUIDTEMPLATE views. The PAGEVIEW does have an enhanced PageInformation object already. Example DatabaseQueryProcessor: page.10.dataProcessing.10 = database-query page.10.dataProcessing.10.as = mainContent page.10.dataProcessing.10.table = tt_content page.10.dataProcessing.10.select.where = colPos=0 page.10.dataProcessing.10.dataProcessing.10 = record-transformation Example FLUIDTEMPLATE: tt_content.text { templateName = Text dataProcessing { 10 = record-transformation 10 { as = data } } } Resolves: #103783 Releases: main Change-Id: I41a5ee3e9403ea5695661e197538e0dca2d207e5 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/83747 Tested-by: -
Benni Mack authored
This change allows for search for UIDs of versioned records in the page tree, which have been created within the workspace. Resolves: #103237 Releases: main, 12.4 Change-Id: Ia836d6ff50a9a8dccce69666a1f3614e959a2b19 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/83167 Tested-by:
-
Benni Mack authored
The "frame" parameter is no longer evaluated in the showpic eID as it allowed uncontrolled resource consumption. This parameter was actually never used by ContentObjectRenderer and existed since the initial commit and is therefore put behind a feature flag. Resolves: #103306 Releases: main, 13.1, 12.4, 11.5 Change-Id: I87019e58c078c8ccafc0b7ce42fe28b49dc068e4 Security-Bulletin: TYPO3-CORE-SA-2024-010 Security-References: CVE-2024-34358 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84267 Tested-by:
-
Oliver Hader authored
Resolves: #103303 Releases: main, 13.1, 12.4, 11.5 Change-Id: I2842cefd5dfc0aff920e61b5fd16f029db8ada4c Security-Bulletin: TYPO3-CORE-SA-2024-009 Security-References: CVE-2024-34357 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84266 Tested-by:
-
Benjamin Franzke authored
Encode non prepared output of BackendUtility::getRecordTitle. The string returned by getRecordTitle is only HTML encoded if the third parameter (`$prep`) is set to true, ensure that non-prepared usages are encoded on render. Resolves: #103782 Releases: main, 13.1, 12.4, 11.5 Change-Id: I96b9530d118a21163d6679ebf7120aa40c7ac7b6 Security-Bulletin: TYPO3-CORE-SA-2024-008 Security-References: CVE-2024-34356 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84265 Tested-by:
-
Benjamin Franzke authored
Encode non prepared output of BackendUtility::getRecordTitle. The string returned by getRecordTitle is only HTML encoded if the third parameter (`$prep`) is set to true. ensure that non-prepared usages are encoded on render. Resolves: #103406 Releases: main, 13.1 Change-Id: I2aeefc20d526078ef905905b136dcd405fda337a Security-Bulletin: TYPO3-CORE-SA-2024-007 Security-References: CVE-2024-34355 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84264 Tested-by:
-
Oliver Bartsch authored
The last used action is now properly resolved again in the backend user module. Due to the fact that accessing the module, extbase always uses `index` as the selected action, the stored user state was never resolved. This is now fixed by using the index action as forward action, forwarding to either the stored default action or falling back the new "listAction" which now acts as the main entry point. Resolves: #103692 Releases: main, 12.4 Change-Id: I764d130dc1a53a8fed25dadfaecaab5dd4eb58de Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/83945 Reviewed-by:
Josef Glatz <typo3@josefglatz.at> Tested-by:
-
Stefan Bürk authored
With #94499 creating redirects on page slug changes has been enhanced to determine the source based on real url building, respecting available site configuration route enhancer options, for example PageTypeSuffix for page-type zero (`0`) in addition to plain slug replacement generation. The plain slug replacement does not take disabled state (`hidden`) or scheduled state `starttime/endtime` into account, the advanced url building using the PageRouter respected the context - which discards hidden pages or pages outside the scheduled range. To solve this issue, the `VisibilityAspect` in the context can be changed to allow hidden and scheduled records which also revealed a inconsistency between the option comment and the behaviour, and the fact that this option has been missed. This has been addressed with #103831 to enable this solution to work properly. This change introduces a new internal method `getAdjustedContext()` to `\TYPO3\CMS\Redirects\EventListener\AddPageTypeZeroSource` to ensure a context to build uris for hidden pages and/or pages which are scheduled and outside the constraint. The modified context is used in `createPageTypeZeroSource()` instead of the current index. Functional tests are added to cover this behaviour. Resolves: #103436 Resolves: #103798 Related: #103831 Related: #94499 Releases: main, 12.4 Change-Id: I05cf793eacb7fb2f39c1ceeb72fcbd0bd3b16719 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84229 Tested-by:
-
Garvin Hicking authored
Attributes passed via TypoScript like: ``` page { includeJSLibs { someIncludeFile = EXT:sitepackage/... someIncludeFile.forceOnTop = 1 } ``` were wrongly passed on to the `<script>` tag, resulting in: ``` <script src="/_assets/…" forceontop="1"></script> ``` This patch streamlines removing the specific `<script>` and `<link>` tag attributes with a central function to prevent further copy+paste differences, and better makes visible which TypoScript attributes are removable for which type. Tests are added to ensure this works, and can act as a regression check. All of the keys that are unset from `additionalAttribute`s are handled through their `addCssFile/addCssLibrary/addJsFile/addJsFooterLibrary()` methods, and thus would not be emitted again. Please note, this patch deals with one part of the issue. The other portion about whether "data." is a good TypoScript subkey or not is beyond scope, and was already fixed in documentation. Resolves: #100954 Releases: main, 12.4 Change-Id: Icd0f7e958387c985b7373623a0fba3656120a57a Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84182 Tested-by:
-
- May 13, 2024
-
-
Lina Wolf authored
->expr() must be executed on QueryBuilder, not on Connection Releases: main Resolves: #103829 Change-Id: Ib3af65e266fd5a467087b23a24f04c1851be3e78 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84232 Reviewed-by:
-
Stefan Bürk authored
With #94499 creating redirects on page slug changes has been enhanced to determine the source based on real url building respecting available site configuration route enhancer options, for example PageTypeSuffix for page-type zero (`0`) in addition to plain slug replacement generation. This included a check to drop the `PlainSlugReplacementSource` if they match - which should be the case as long as no suffix are defined for `page-type 0`. Sadly, a default pagetype suffix is configured as slash similar to: routeEnhancers: PageTypeSuffix: type: PageType default: '/' map: '/': 0, '.json': 123 the generated slugs differs by the tailing slash - and thus creating two similar redirects instead of one, which is expected. This change modifies the duplicate detection in the corresponding `\TYPO3\CMS\Redirects\EventListener\AddPageTypeZeroSource` method `sourceEqualsPageTypeZeroSource()` to ignore tailing slashes for the comparision. A functional test is added to ensure this behaviour. Resolves: #103806 Related: #94499 Releases: main, 12.4 Change-Id: I0c07aeb8c13643cfed74de69e52a3a6fceb196cf Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84228 Reviewed-by:Albrecht Köhnlein <ak@koehnlein.eu> Tested-by:
-
Stefan Bürk authored
Since #102793 the PageRepository respects `includeScheduledRecords` from the context `VisibilityAspect` setting in the `PageRepository` and added a runtime cache handling in the `init()` call. However, the cache identifier does not respect the same visibilty options for the cache identifier like it is used for preparing the property `where_hid_del` - and thus leads to invalid and unexpected record retrievement, depending on context switches in a request. This change extends the cache identifier to respect the scheduled record setting and removes the invalid page table except comment. Resolves: #103831 Related: #102793 Releases: main, 12.4 Change-Id: I2e7f038a04d957751bba1181c3d5324c6e0674b5 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84235 Reviewed-by:
-
Benni Mack authored
Ensure env variable from port is cast to integer when setting up TYPO3 with Environment variable TYPO3_INSTALL_DB_PORT. Resolves: #103826 Releases: main, 12.4 Change-Id: Ibd982690d3eec0527f452cd7353bdc0bf1a572c4 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84231 Reviewed-by:
Jörg Bösche <typo3@joergboesche.de> Tested-by:
-
Georg Ringer authored
It might be that pages are still available which are outdated regarding its language. This can be when a site language has been removed from the configuration. Therefore those pages should be skipped when checking the integrity. Resolves: #103801 Releases: main, 12.4 Change-Id: Ic5ca071ff8d2b5956365a432fa0f99da5772595f Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84180 Tested-by:
-
Benjamin Franzke authored
When a content element (CE) gets edited or the visibility is toggled, the page module is reloaded with an anchor in the URL to scroll to the content element that was updated. After #103381 it was not possible anymore to click the "+ Content" button above such CE. The reason is that a pseudo element `:target:before` is generated with a specific height and margin to overcome the height of the floating module docheader, overlaying the CE action button. In the patch mentioned before, `overflow: hidden` was removed to make the `box-shadow` of the CE visible, finally causing this bug. To solve this issue the pseudo element add it #97036 is replaced by the CSS option scroll-padding-top. It incorperates the maximum docheader size plus a slight margin that is slightly lower than the grid margin – but not equal to – to move shadows of adjacent elements out of sight. Resolves: #103672 Related: #103381 Related: #97036 Releases: main, 12.4 Change-Id: I8d5c9eadd45e5507e39b1fb728de65d31c1d6689 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/83998 Tested-by:
Ayke Halder <mail@ayke-halder.de> Tested-by:
-
Andreas Kienast authored
This commit updates `phpstan/phpstan` to 1.11.0 and its related friends to their latest respective version. Executed command composer require --dev \ phpstan/phpdoc-parser:^1.29.0 \ phpstan/phpstan:^1.11.0 \ phpstan/phpstan-phpunit:^1.4.0 \ -W Resolves: #103823 Releases: main, 13.1, 12.4 Change-Id: Idc057895d503089c03a8cb5358be4ea7e3575e93 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/84221 Reviewed-by:
-
